From da4cdd7619cb724a1da403348108522eb49e1b1e Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Tue, 22 Jul 2003 21:08:40 +0000 Subject: [PATCH] rs=leaf Remove XP_OS2_VACPP from the tree git-svn-id: svn://10.0.0.236/trunk@145083 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/jpeg/jpeglib.h | 8 ------ mozilla/js/src/Makefile.in | 4 --- mozilla/js/src/jslibmath.h | 38 ++------------------------ mozilla/js/src/jslock.c | 4 --- mozilla/js/src/jslock.h | 2 +- mozilla/js/src/jsnum.c | 12 +------- mozilla/js/src/jstypes.h | 22 ++------------- mozilla/js/src/jsutil.c | 10 ++----- mozilla/modules/libreg/include/NSReg.h | 4 +-- 9 files changed, 9 insertions(+), 95 deletions(-) diff --git a/mozilla/jpeg/jpeglib.h b/mozilla/jpeg/jpeglib.h index 0d7123c6bc0..7f11ffe162b 100644 --- a/mozilla/jpeg/jpeglib.h +++ b/mozilla/jpeg/jpeglib.h @@ -27,14 +27,6 @@ #ifdef RGB_BLUE #undef RGB_BLUE #endif -/* - * Tweak for jconfig for OS/2 (rather than replicate all the rest of it in jos2fig.h). - */ -#ifdef XP_OS2_VACPP -#undef INLINE -#define INLINE -#endif -#endif /* * First we include the configuration files that record how this diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in index 8a693b3c3be..1f757fa8b36 100644 --- a/mozilla/js/src/Makefile.in +++ b/mozilla/js/src/Makefile.in @@ -91,10 +91,6 @@ CSRCS = \ prmjtime.c \ $(NULL) -ifeq ($(MOZ_OS2_TOOLS),VACPP) -ASFILES = jslocko.asm -endif - EXPORTS = \ jsautocfg.h \ js.msg \ diff --git a/mozilla/js/src/jslibmath.h b/mozilla/js/src/jslibmath.h index 365bb723693..fa128da0214 100644 --- a/mozilla/js/src/jslibmath.h +++ b/mozilla/js/src/jslibmath.h @@ -18,7 +18,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): + * IBM Corp. * * Alternatively, the contents of this file may be used under the * terms of the GNU Public License (the "GPL"), in which case the @@ -30,17 +31,6 @@ * and other provisions required by the GPL. If you do not delete * the provisions above, a recipient may use your version of this * file under either the NPL or the GPL. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 2000 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 04/20/2000 IBM Corp. OS/2 VisualAge build. */ /* @@ -84,9 +74,6 @@ #elif defined(AIX) #define JS_USE_FDLIBM_MATH 1 -#elif defined(XP_OS2_VACPP) -#define JS_USE_FDLIBM_MATH 1 - #else #define JS_USE_FDLIBM_MATH 0 #endif @@ -268,27 +255,6 @@ extern double fd_ceil __P((double)); extern double fd_pow __P((double,double)); extern double fd_tan __P((double)); -#elif defined(XP_OS2_VACPP) - -#define fd_acos acos -#define fd_asin asin -#define fd_atan2 atan2 -#define fd_cos cos -#define fd_exp exp -#define fd_fabs fabs -#define fd_floor floor -#define fd_fmod fmod -#define fd_log log -#define fd_sin sin -#define fd_sqrt sqrt -#define fd_atan atan -#define fd_ceil ceil -#define fd_pow pow -#define fd_tan tan - -/* OS2 lacks copysign */ -extern double fd_copysign __P((double, double)); - #else /* other platform.. generic paranoid slow fdlibm */ extern double fd_acos __P((double)); diff --git a/mozilla/js/src/jslock.c b/mozilla/js/src/jslock.c index 4af17c55256..dd86cd26ab3 100644 --- a/mozilla/js/src/jslock.c +++ b/mozilla/js/src/jslock.c @@ -150,10 +150,6 @@ js_CompareAndSwap(jsword *w, jsword ov, jsword nv) return !_check_lock((atomic_p)w, ov, nv); } -#elif defined(XP_OS2_VACPP) - -/* js_CompareAndSwap implemented in jslocko.asm */ - #else #error "Define NSPR_LOCK if your platform lacks a compare-and-swap instruction." diff --git a/mozilla/js/src/jslock.h b/mozilla/js/src/jslock.h index 7eaa479a2fd..c5da4005b54 100644 --- a/mozilla/js/src/jslock.h +++ b/mozilla/js/src/jslock.h @@ -199,7 +199,7 @@ extern JSBool js_IsScopeLocked(JSScope *scope); !( (defined(_WIN32) && defined(_M_IX86)) || \ (defined(__GNUC__) && defined(__i386__)) || \ (defined(SOLARIS) && defined(sparc) && defined(ULTRA_SPARC)) || \ - defined(AIX) || defined(XP_OS2_VACPP) ) + defined(AIX) ) #define NSPR_LOCK 1 diff --git a/mozilla/js/src/jsnum.c b/mozilla/js/src/jsnum.c index f953b280703..dcf682ca49d 100644 --- a/mozilla/js/src/jsnum.c +++ b/mozilla/js/src/jsnum.c @@ -19,6 +19,7 @@ * Rights Reserved. * * Contributor(s): + * IBM Corp. * * Alternatively, the contents of this file may be used under the * terms of the GNU Public License (the "GPL"), in which case the @@ -30,17 +31,6 @@ * and other provisions required by the GPL. If you do not delete * the provisions above, a recipient may use your version of this * file under either the NPL or the GPL. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 2000 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 05/15/2000 IBM Corp. Modified OS/2 floating point init. */ /* diff --git a/mozilla/js/src/jstypes.h b/mozilla/js/src/jstypes.h index fcbecf61eca..03f46b01753 100644 --- a/mozilla/js/src/jstypes.h +++ b/mozilla/js/src/jstypes.h @@ -18,7 +18,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): + * IBM Corp. * * Alternatively, the contents of this file may be used under the * terms of the GNU Public License (the "GPL"), in which case the @@ -30,17 +31,6 @@ * and other provisions required by the GPL. If you do not delete * the provisions above, a recipient may use your version of this * file under either the NPL or the GPL. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 2000 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 04/20/2000 IBM Corp. OS/2 VisualAge build. */ /* @@ -122,14 +112,6 @@ #define JS_DLL_CALLBACK #define JS_STATIC_DLL_CALLBACK(__x) static __x -#elif defined(XP_OS2_VACPP) -#define JS_EXTERN_API(__type) extern __type -#define JS_EXPORT_API(__type) __type -#define JS_EXTERN_DATA(__type) extern __type -#define JS_EXPORT_DATA(__type) __type -#define JS_DLL_CALLBACK _Optlink -#define JS_STATIC_DLL_CALLBACK(__x) static __x JS_DLL_CALLBACK - #else /* Unix */ #define JS_EXTERN_API(__type) extern __type diff --git a/mozilla/js/src/jsutil.c b/mozilla/js/src/jsutil.c index 1971d6273b3..c723aef7d4e 100644 --- a/mozilla/js/src/jsutil.c +++ b/mozilla/js/src/jsutil.c @@ -18,7 +18,8 @@ * Copyright (C) 1998 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): + * IBM Corp. * * Alternatively, the contents of this file may be used under the * terms of the GNU Public License (the "GPL"), in which case the @@ -30,13 +31,6 @@ * and other provisions required by the GPL. If you do not delete * the provisions above, a recipient may use your version of this * file under either the NPL or the GPL. - * - * This Original Code has been modified by IBM Corporation. Modifications made by IBM - * described herein are Copyright (c) International Business Machines Corporation, 2000. - * Modifications to Mozilla code or documentation identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 04/10/2000 IBM Corp. Added DebugBreak() definitions for OS/2 */ /* diff --git a/mozilla/modules/libreg/include/NSReg.h b/mozilla/modules/libreg/include/NSReg.h index dab5eeb0da6..ab75fccb60d 100644 --- a/mozilla/modules/libreg/include/NSReg.h +++ b/mozilla/modules/libreg/include/NSReg.h @@ -100,7 +100,7 @@ typedef struct _reginfo #define UNIX_GLOBAL_FLAG "MOZILLA_SHARED_REGISTRY" /* Platform-dependent declspec for library interface */ -#if defined(XP_WIN) || defined(XP_OS2_VACPP) +#if defined(XP_WIN) #if defined(WIN32) #if defined (STANDALONE_REGISTRY) #define VR_INTERFACE(type) __declspec(dllexport) type __cdecl @@ -108,8 +108,6 @@ typedef struct _reginfo #define VR_INTERFACE(type) __declspec(dllexport) type __stdcall #endif - #elif defined(XP_OS2_VACPP) - #define VR_INTERFACE(type) type _Optlink #else #define VR_INTERFACE(type) type _far _pascal _export #endif