diff options
| -rw-r--r-- | src/moz-sdk/jni_md.h | 16 | ||||
| -rw-r--r-- | src/moz-sdk/jri_md.h | 29 | ||||
| -rw-r--r-- | src/moz-sdk/npapi.h | 15 | ||||
| -rw-r--r-- | src/moz-sdk/nptypes.h | 2 |
4 files changed, 6 insertions, 56 deletions
diff --git a/src/moz-sdk/jni_md.h b/src/moz-sdk/jni_md.h index 22d0de9..2274410 100644 --- a/src/moz-sdk/jni_md.h +++ b/src/moz-sdk/jni_md.h @@ -65,7 +65,7 @@ * This is where we define the mystical JNI_PUBLIC_API macro that works on all * platforms. If you're running with Visual C++ or Symantec C * development environment on the PC, you're all set. Or if you're on the Mac - * with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't + * with Symantec or MPW with SC you're ok too. For UNIX it shouldn't * matter. * Changes by sailesh on 9/26 @@ -144,19 +144,7 @@ /* Mac */ #elif macintosh || Macintosh || THINK_C -# if defined(__MWERKS__) /* Metrowerks */ -# if !__option(enumsalwaysint) -# error You need to define 'Enums Always Int' for your project. -# endif -# if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM -# if !__option(fourbyteints) -# error You need to define 'Struct Alignment: 68k' for your project. -# endif -# endif /* !GENERATINGCFM */ -# define JNI_PUBLIC_API(ResultType) __declspec(export) ResultType -# define JNI_PUBLIC_VAR(VarType) JNI_PUBLIC_API(VarType) -# define JNI_NATIVE_STUB(ResultType) JNI_PUBLIC_API(ResultType) -# elif defined(__SC__) /* Symantec */ +# if defined(__SC__) /* Symantec */ # error What are the Symantec defines? ([email protected]) # elif macintosh && applec /* MPW */ # error Please upgrade to the latest MPW compiler (SC). diff --git a/src/moz-sdk/jri_md.h b/src/moz-sdk/jri_md.h index c41c4aa..06e377e 100644 --- a/src/moz-sdk/jri_md.h +++ b/src/moz-sdk/jri_md.h @@ -54,7 +54,7 @@ extern "C" { * This is where we define the mystical JRI_PUBLIC_API macro that works on all * platforms. If you're running with Visual C++ or Symantec C * development environment on the PC, you're all set. Or if you're on the Mac - * with Metrowerks, Symantec or MPW with SC you're ok too. For UNIX it shouldn't + * with Symantec or MPW with SC you're ok too. For UNIX it shouldn't * matter. * * On UNIX though you probably care about a couple of other symbols though: @@ -114,21 +114,7 @@ extern "C" { /* Mac */ #elif defined (macintosh) || Macintosh || THINK_C -# if defined(__MWERKS__) /* Metrowerks */ -# if !__option(enumsalwaysint) -# error You need to define 'Enums Always Int' for your project. -# endif -# if defined(TARGET_CPU_68K) && !TARGET_RT_MAC_CFM -# if !__option(fourbyteints) -# error You need to define 'Struct Alignment: 68k' for your project. -# endif -# endif /* !GENERATINGCFM */ -# define JRI_PUBLIC_API(ResultType) __declspec(export) ResultType -# define JRI_PUBLIC_VAR(VarType) JRI_PUBLIC_API(VarType) -# define JRI_PUBLIC_VAR_EXP(VarType) JRI_PUBLIC_API(VarType) -# define JRI_PUBLIC_VAR_IMP(VarType) JRI_PUBLIC_API(VarType) -# define JRI_NATIVE_STUB(ResultType) JRI_PUBLIC_API(ResultType) -# elif defined(__SC__) /* Symantec */ +# if defined(__SC__) /* Symantec */ # error What are the Symantec defines? ([email protected]) # elif macintosh && applec /* MPW */ # error Please upgrade to the latest MPW compiler (SC). @@ -192,16 +178,7 @@ typedef long jint; #ifdef HAVE_LONG_LONG -#ifdef OSF1 - -/* long is default 64-bit on OSF1, -std1 does not allow long long */ -typedef long jlong; -typedef unsigned long julong; -#define jlong_MAXINT 0x7fffffffffffffffL -#define jlong_MININT 0x8000000000000000L -#define jlong_ZERO 0x0L - -#elif (defined(WIN32) || defined(_WIN32)) +#if (defined(WIN32) || defined(_WIN32)) typedef LONGLONG jlong; typedef DWORDLONG julong; diff --git a/src/moz-sdk/npapi.h b/src/moz-sdk/npapi.h index df8c537..8998ba5 100644 --- a/src/moz-sdk/npapi.h +++ b/src/moz-sdk/npapi.h @@ -91,21 +91,6 @@ # endif /* XP_WIN */ #endif /* _WINDOWS */ -#ifdef __MWERKS__ -# define _declspec __declspec -# ifdef macintosh -# ifndef XP_MAC -# define XP_MAC 1 -# endif /* XP_MAC */ -# endif /* macintosh */ -# ifdef __INTEL__ -# undef NULL -# ifndef XP_WIN -# define XP_WIN 1 -# endif /* XP_WIN */ -# endif /* __INTEL__ */ -#endif /* __MWERKS__ */ - #if defined(XP_MAC) || defined(XP_MACOSX) #include <Quickdraw.h> #include <Events.h> diff --git a/src/moz-sdk/nptypes.h b/src/moz-sdk/nptypes.h index 45c0441..fbe6bd7 100644 --- a/src/moz-sdk/nptypes.h +++ b/src/moz-sdk/nptypes.h @@ -47,7 +47,7 @@ */ typedef int int32_t; typedef unsigned int uint32_t; -#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(IRIX) || defined(HPUX) +#elif defined(_AIX) || defined(__sun) || defined(IRIX) || defined(HPUX) /* * AIX and SunOS ship a inttypes.h header that defines [u]int32_t, * but not bool for C. |