Remove support for Metrowerks compilerr14.1.x

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 87bdf38f4a686f7fa22d2b06bca963c17a5f0def)

2 files changed, 4 insertions, 38 deletions

diff --git a/common/lzodefs.h b/common/lzodefs.h
index 79ac460..3789b81 100644
--- a/common/lzodefs.h
+++ b/common/lzodefs.h
@@ -53,7 +53,7 @@
 #  if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2))
 #    pragma GCC diagnostic ignored "-Wundef"
 #  endif
-#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
+#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #  if ((_MSC_VER-0) >= 1300)
 #    pragma warning(disable: 4668)
 #  endif
@@ -333,9 +333,6 @@
 #elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
 #  define LZO_OS_WIN32          1
 #  define LZO_INFO_OS           "win32"
-#elif defined(__MWERKS__) && defined(__INTEL__)
-#  define LZO_OS_WIN32          1
-#  define LZO_INFO_OS           "win32"
 #elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
 #  if (UINT_MAX == LZO_0xffffL)
 #    define LZO_OS_WIN16        1
@@ -615,10 +612,6 @@
 #  else
 #    define LZO_INFO_CCVER      "unknown"
 #  endif
-#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0)
-#  define LZO_CC_MWERKS         __MWERKS__
-#  define LZO_INFO_CC           "Metrowerks C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__MWERKS__)
 #elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
 #  define LZO_CC_NDPC           1
 #  define LZO_INFO_CC           "Microway NDP C"
@@ -1370,8 +1363,6 @@ extern "C" {
 #  define __lzo_inline          __inline__
 #elif (LZO_CC_INTELC)
 #  define __lzo_inline          __inline
-#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405))
-#  define __lzo_inline          __inline
 #elif (LZO_CC_MSC && (_MSC_VER >= 900))
 #  define __lzo_inline          __inline
 #elif (LZO_CC_SUNPROC >= 0x5100)
@@ -1426,11 +1417,6 @@ extern "C" {
 #  define __lzo_noinline        __attribute__((__noinline__))
 #elif (LZO_CC_MSC && (_MSC_VER >= 1300))
 #  define __lzo_noinline        __declspec(noinline)
-#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64))
-#  if defined(__cplusplus)
-#  else
-#    define __lzo_noinline      __declspec(noinline)
-#  endif
 #elif (LZO_CC_PGI >= 0x0d0a00ul)
 #  define __lzo_noinline        __attribute__((__noinline__))
 #elif (LZO_CC_SUNPROC >= 0x5100)
@@ -2061,7 +2047,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_SIZEOF_LONG_LONG      8
 #elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__)))
 #  define LZO_SIZEOF_LONG_LONG      8
-#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
+#elif (LZO_ARCH_I386 && (LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
 #  define LZO_SIZEOF_LONG_LONG      8
 #elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC))
 #  define LZO_SIZEOF___INT64        8
@@ -2341,9 +2327,6 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 #  define LZO_LIBC_GLIBC        (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100)
 #  define LZO_INFO_LIBC         "glibc"
-#elif (LZO_CC_MWERKS) && defined(__MSL__)
-#  define LZO_LIBC_MSL          __MSL__
-#  define LZO_INFO_LIBC         "msl"
 #elif 1 && defined(__IAR_SYSTEMS_ICC__)
 #  define LZO_LIBC_ISOC90       1
 #  define LZO_INFO_LIBC         "isoc90"
diff --git a/common/minilzo.c b/common/minilzo.c
index 1a3b518..cea3fd9 100644
--- a/common/minilzo.c
+++ b/common/minilzo.c
@@ -73,7 +73,7 @@
 #  if ((__GNUC__-0) >= 5 || ((__GNUC__-0) == 4 && (__GNUC_MINOR__-0) >= 2))
 #    pragma GCC diagnostic ignored "-Wundef"
 #  endif
-#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER) && !defined(__MWERKS__)
+#elif defined(_MSC_VER) && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #  if ((_MSC_VER-0) >= 1300)
 #    pragma warning(disable: 4668)
 #  endif
@@ -353,9 +353,6 @@
 #elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32) || defined(__WINDOWS_386__)
 #  define LZO_OS_WIN32          1
 #  define LZO_INFO_OS           "win32"
-#elif defined(__MWERKS__) && defined(__INTEL__)
-#  define LZO_OS_WIN32          1
-#  define LZO_INFO_OS           "win32"
 #elif defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
 #  if (UINT_MAX == LZO_0xffffL)
 #    define LZO_OS_WIN16        1
@@ -635,10 +632,6 @@
 #  else
 #    define LZO_INFO_CCVER      "unknown"
 #  endif
-#elif defined(__MWERKS__) && ((__MWERKS__-0) > 0)
-#  define LZO_CC_MWERKS         __MWERKS__
-#  define LZO_INFO_CC           "Metrowerks C"
-#  define LZO_INFO_CCVER        LZO_PP_MACRO_EXPAND(__MWERKS__)
 #elif (defined(__NDPC__) || defined(__NDPX__)) && defined(__i386)
 #  define LZO_CC_NDPC           1
 #  define LZO_INFO_CC           "Microway NDP C"
@@ -1390,8 +1383,6 @@ extern "C" {
 #  define __lzo_inline          __inline__
 #elif (LZO_CC_INTELC)
 #  define __lzo_inline          __inline
-#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x2405))
-#  define __lzo_inline          __inline
 #elif (LZO_CC_MSC && (_MSC_VER >= 900))
 #  define __lzo_inline          __inline
 #elif (LZO_CC_SUNPROC >= 0x5100)
@@ -1446,11 +1437,6 @@ extern "C" {
 #  define __lzo_noinline        __attribute__((__noinline__))
 #elif (LZO_CC_MSC && (_MSC_VER >= 1300))
 #  define __lzo_noinline        __declspec(noinline)
-#elif (LZO_CC_MWERKS && (__MWERKS__ >= 0x3200) && (LZO_OS_WIN32 || LZO_OS_WIN64))
-#  if defined(__cplusplus)
-#  else
-#    define __lzo_noinline      __declspec(noinline)
-#  endif
 #elif (LZO_CC_PGI >= 0x0d0a00ul)
 #  define __lzo_noinline        __attribute__((__noinline__))
 #elif (LZO_CC_SUNPROC >= 0x5100)
@@ -2081,7 +2067,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long))
 #  define LZO_SIZEOF_LONG_LONG      8
 #elif (LZO_ARCH_I386 && (LZO_CC_INTELC && defined(__linux__)))
 #  define LZO_SIZEOF_LONG_LONG      8
-#elif (LZO_ARCH_I386 && (LZO_CC_MWERKS || LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
+#elif (LZO_ARCH_I386 && (LZO_CC_PELLESC || LZO_CC_PGI || LZO_CC_SUNPROC))
 #  define LZO_SIZEOF_LONG_LONG      8
 #elif (LZO_ARCH_I386 && (LZO_CC_INTELC || LZO_CC_MSC))
 #  define LZO_SIZEOF___INT64        8
@@ -2361,9 +2347,6 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t))
 #elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 #  define LZO_LIBC_GLIBC        (__GLIBC__ * 0x10000L + (__GLIBC_MINOR__-0) * 0x100)
 #  define LZO_INFO_LIBC         "glibc"
-#elif (LZO_CC_MWERKS) && defined(__MSL__)
-#  define LZO_LIBC_MSL          __MSL__
-#  define LZO_INFO_LIBC         "msl"
 #elif 1 && defined(__IAR_SYSTEMS_ICC__)
 #  define LZO_LIBC_ISOC90       1
 #  define LZO_INFO_LIBC         "isoc90"