diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-30 22:36:39 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-12-30 22:36:39 +0900 |
| commit | 05ecb51ac3b81f9007298266b56508e63dcbb57d (patch) | |
| tree | 2a734873ff40afc8ee5f8cc37dcc66388109862d | |
| parent | eb663307fceadd0a7d6acecb39e220367a9a92e0 (diff) | |
| download | kaffeine-mozilla-05ecb51ac3b81f9007298266b56508e63dcbb57d.tar.gz kaffeine-mozilla-05ecb51ac3b81f9007298266b56508e63dcbb57d.zip | |
Remove support for Metrowerks compiler
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | src/jni_md.h | 16 | ||||
| -rw-r--r-- | src/jri_md.h | 18 | ||||
| -rw-r--r-- | src/npapi.h | 7 |
3 files changed, 4 insertions, 37 deletions
diff --git a/src/jni_md.h b/src/jni_md.h index 6d655bf..57526dd 100644 --- a/src/jni_md.h +++ b/src/jni_md.h @@ -48,7 +48,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 @@ -127,19 +127,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? (warren@netscape.com) # elif macintosh && applec /* MPW */ # error Please upgrade to the latest MPW compiler (SC). diff --git a/src/jri_md.h b/src/jri_md.h index 9a399a3..3610b68 100644 --- a/src/jri_md.h +++ b/src/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? (warren@netscape.com) # elif macintosh && applec /* MPW */ # error Please upgrade to the latest MPW compiler (SC). diff --git a/src/npapi.h b/src/npapi.h index ca07f85..305ac2e 100644 --- a/src/npapi.h +++ b/src/npapi.h @@ -8,13 +8,6 @@ #include "jri.h" /* Java Runtime Interface */ -/* XXX this needs to get out of here */ -#if defined(__MWERKS__) -#ifndef XP_MAC -#define XP_MAC -#endif -#endif - /*----------------------------------------------------------------------*/ |