replace MACOSX with proper macro: __APPLE__ (https://sourceforge.net/p/predef/wiki/OperatingSystems/)

svn path=/trunk/externals/miXed/; revision=16957

35 files changed, 38 insertions, 38 deletions

diff --git a/cyclone/hammer/acos.c b/cyclone/hammer/acos.c
index 7175476..9aa52b3 100644
--- a/cyclone/hammer/acos.c
+++ b/cyclone/hammer/acos.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define acosf  acos
 #endif
diff --git a/cyclone/hammer/asin.c b/cyclone/hammer/asin.c
index 18f8c72..89c91a0 100644
--- a/cyclone/hammer/asin.c
+++ b/cyclone/hammer/asin.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define asinf  asin
 #endif
diff --git a/cyclone/hammer/cartopol.c b/cyclone/hammer/cartopol.c
index ce9f546..962a05e 100644
--- a/cyclone/hammer/cartopol.c
+++ b/cyclone/hammer/cartopol.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define atan2f  atan2
 #define hypotf  hypot
diff --git a/cyclone/hammer/cosh.c b/cyclone/hammer/cosh.c
index 664c169..97a375e 100644
--- a/cyclone/hammer/cosh.c
+++ b/cyclone/hammer/cosh.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define coshf  cosh
 #endif
diff --git a/cyclone/hammer/poltocar.c b/cyclone/hammer/poltocar.c
index d634b8f..4ff5152 100644
--- a/cyclone/hammer/poltocar.c
+++ b/cyclone/hammer/poltocar.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinf  sin
 #define cosf  cos
diff --git a/cyclone/hammer/sinh.c b/cyclone/hammer/sinh.c
index d3d41fb..a2f2157 100644
--- a/cyclone/hammer/sinh.c
+++ b/cyclone/hammer/sinh.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinhf  sinh
 #endif
diff --git a/cyclone/hammer/tanh.c b/cyclone/hammer/tanh.c
index 470fb21..4ccf150 100644
--- a/cyclone/hammer/tanh.c
+++ b/cyclone/hammer/tanh.c
@@ -5,7 +5,7 @@
 #include <math.h>
 #include "m_pd.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define tanhf  tanh
 #endif
diff --git a/cyclone/shadow/nettles.c b/cyclone/shadow/nettles.c
index 83fae9b..dbcb28f 100644
--- a/cyclone/shadow/nettles.c
+++ b/cyclone/shadow/nettles.c
@@ -8,7 +8,7 @@
 #include "sickle/sic.h"
 #include "shadow.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define fmodf  fmod
 #endif
diff --git a/cyclone/sickle/acos.c b/cyclone/sickle/acos.c
index df248d0..3b706b1 100644
--- a/cyclone/sickle/acos.c
+++ b/cyclone/sickle/acos.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define acosf  acos
 #endif
diff --git a/cyclone/sickle/acosh.c b/cyclone/sickle/acosh.c
index 5402711..eabecb5 100644
--- a/cyclone/sickle/acosh.c
+++ b/cyclone/sickle/acosh.c
@@ -7,7 +7,7 @@
 #include "sickle/sic.h"
 
 /* LATER ask about osx */
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 #define acoshf(x)  (log(x + sqrt(x * x - 1)))
 #endif
 
diff --git a/cyclone/sickle/asin.c b/cyclone/sickle/asin.c
index fbaaea1..282c830 100644
--- a/cyclone/sickle/asin.c
+++ b/cyclone/sickle/asin.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define asinf  asin
 #endif
diff --git a/cyclone/sickle/asinh.c b/cyclone/sickle/asinh.c
index 11dcb81..367ce0c 100644
--- a/cyclone/sickle/asinh.c
+++ b/cyclone/sickle/asinh.c
@@ -7,7 +7,7 @@
 #include "sickle/sic.h"
 
 /* LATER ask about osx */
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 #define asinhf(x)  (log(x + sqrt(x * x + 1)))
 #endif
 
diff --git a/cyclone/sickle/atan.c b/cyclone/sickle/atan.c
index 832cdb3..89d8e88 100644
--- a/cyclone/sickle/atan.c
+++ b/cyclone/sickle/atan.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define atanf  atan
 #endif
diff --git a/cyclone/sickle/atan2.c b/cyclone/sickle/atan2.c
index 32598fd..327efd1 100644
--- a/cyclone/sickle/atan2.c
+++ b/cyclone/sickle/atan2.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define atan2f  atan2
 #endif
diff --git a/cyclone/sickle/atanh.c b/cyclone/sickle/atanh.c
index 130677a..4152236 100644
--- a/cyclone/sickle/atanh.c
+++ b/cyclone/sickle/atanh.c
@@ -7,7 +7,7 @@
 #include "sickle/sic.h"
 
 /* LATER ask about osx */
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 #define atanhf(x)  (log((1 + x) / (1 - x)) * 0.5)
 #endif
 
diff --git a/cyclone/sickle/average.c b/cyclone/sickle/average.c
index 679d59f..870ca0d 100644
--- a/cyclone/sickle/average.c
+++ b/cyclone/sickle/average.c
@@ -10,7 +10,7 @@
 #include "common/loud.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sqrtf  sqrt
 #endif
diff --git a/cyclone/sickle/cartopol.c b/cyclone/sickle/cartopol.c
index 2823268..8513af6 100644
--- a/cyclone/sickle/cartopol.c
+++ b/cyclone/sickle/cartopol.c
@@ -7,7 +7,7 @@
 #include "unstable/fragile.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define atan2f  atan2
 #define hypotf  hypot
diff --git a/cyclone/sickle/cosh.c b/cyclone/sickle/cosh.c
index 52d1733..87f195f 100644
--- a/cyclone/sickle/cosh.c
+++ b/cyclone/sickle/cosh.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define coshf  cosh
 #endif
diff --git a/cyclone/sickle/cosx.c b/cyclone/sickle/cosx.c
index c9f14ec..d86fdae 100644
--- a/cyclone/sickle/cosx.c
+++ b/cyclone/sickle/cosx.c
@@ -9,7 +9,7 @@
 /* by definition, this is just an interface to the -lm call
    (do not use costable) */
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define cosf  cos
 #endif
diff --git a/cyclone/sickle/linedrive.c b/cyclone/sickle/linedrive.c
index a8a4ac5..d9243db 100644
--- a/cyclone/sickle/linedrive.c
+++ b/cyclone/sickle/linedrive.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "common/fitter.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 #define logf  log
 #define expf  exp
 #endif
diff --git a/cyclone/sickle/log.c b/cyclone/sickle/log.c
index 66d2146..0a14070 100644
--- a/cyclone/sickle/log.c
+++ b/cyclone/sickle/log.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define logf  log
 #endif
diff --git a/cyclone/sickle/lores.c b/cyclone/sickle/lores.c
index 83d2b35..2fe71ee 100644
--- a/cyclone/sickle/lores.c
+++ b/cyclone/sickle/lores.c
@@ -12,7 +12,7 @@
 #include "shared.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define expf  exp
 #define cosf  cos
diff --git a/cyclone/sickle/onepole.c b/cyclone/sickle/onepole.c
index 29fe64f..dec0ee1 100644
--- a/cyclone/sickle/onepole.c
+++ b/cyclone/sickle/onepole.c
@@ -12,7 +12,7 @@
 #include "shared.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinf  sin
 #endif
diff --git a/cyclone/sickle/overdrive.c b/cyclone/sickle/overdrive.c
index 8490070..7bee8f7 100644
--- a/cyclone/sickle/overdrive.c
+++ b/cyclone/sickle/overdrive.c
@@ -7,7 +7,7 @@
 #include "sickle/sic.h"
 
 /* FIXME this is unnecessary in vc > 6.0 and darwin? */
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 #define powf  pow
 #endif
 
diff --git a/cyclone/sickle/poltocar.c b/cyclone/sickle/poltocar.c
index bf72637..1becc44 100644
--- a/cyclone/sickle/poltocar.c
+++ b/cyclone/sickle/poltocar.c
@@ -7,7 +7,7 @@
 #include "unstable/fragile.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinf  sin
 #define cosf  cos
diff --git a/cyclone/sickle/pow.c b/cyclone/sickle/pow.c
index caaa06c..2f95e8f 100644
--- a/cyclone/sickle/pow.c
+++ b/cyclone/sickle/pow.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define powf  pow
 #endif
diff --git a/cyclone/sickle/reson.c b/cyclone/sickle/reson.c
index 29d3e61..a9d9cf4 100644
--- a/cyclone/sickle/reson.c
+++ b/cyclone/sickle/reson.c
@@ -13,7 +13,7 @@
 #include "shared.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define expf  exp
 #define cosf  cos
diff --git a/cyclone/sickle/sinh.c b/cyclone/sickle/sinh.c
index 1596168..ff33b65 100644
--- a/cyclone/sickle/sinh.c
+++ b/cyclone/sickle/sinh.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinhf  sinh
 #endif
diff --git a/cyclone/sickle/sinx.c b/cyclone/sickle/sinx.c
index db0567d..29c7c4e 100644
--- a/cyclone/sickle/sinx.c
+++ b/cyclone/sickle/sinx.c
@@ -9,7 +9,7 @@
 /* by definition, this is just an interface to the -lm call
    (do not use costable) */
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinf  sin
 #endif
diff --git a/cyclone/sickle/svf.c b/cyclone/sickle/svf.c
index 82e81a9..bb8437b 100644
--- a/cyclone/sickle/svf.c
+++ b/cyclone/sickle/svf.c
@@ -14,7 +14,7 @@
 #include "shared.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define sinf  sin
 #endif
diff --git a/cyclone/sickle/tanh.c b/cyclone/sickle/tanh.c
index 1f7f83f..0278e84 100644
--- a/cyclone/sickle/tanh.c
+++ b/cyclone/sickle/tanh.c
@@ -6,7 +6,7 @@
 #include "m_pd.h"
 #include "sickle/sic.h"
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define tanhf  tanh
 #endif
diff --git a/cyclone/sickle/tanx.c b/cyclone/sickle/tanx.c
index 5f86f8f..b55e748 100644
--- a/cyclone/sickle/tanx.c
+++ b/cyclone/sickle/tanx.c
@@ -9,7 +9,7 @@
 /* by definition, this is just an interface to the -lm call
    (do not use costable) */
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define tanf  tan
 #endif
diff --git a/shared/common/mifi.c b/shared/common/mifi.c
index 44b9483..306e427 100644
--- a/shared/common/mifi.c
+++ b/shared/common/mifi.c
@@ -58,7 +58,7 @@ typedef u_int16_t uint16;
 #ifndef uchar
 typedef u_int8_t uchar;
 #endif
-#else  /* MACOSX */
+#else  /* __APPLE__ */
 #ifndef uint32
 typedef unsigned int uint32;
 #endif
diff --git a/shared/sickle/sic.c b/shared/sickle/sic.c
index a306095..75b3d54 100644
--- a/shared/sickle/sic.c
+++ b/shared/sickle/sic.c
@@ -14,7 +14,7 @@
 //#define SIC_DEBUG
 #endif
 
-#if defined(_WIN32) || defined(MACOSX)
+#if defined(_WIN32) || defined(__APPLE__)
 /* cf pd/src/x_arithmetic.c */
 #define cosf  cos
 #endif
diff --git a/shared/unstable/loader.c b/shared/unstable/loader.c
index 62e9aaf..1de2800 100644
--- a/shared/unstable/loader.c
+++ b/shared/unstable/loader.c
@@ -17,7 +17,7 @@
 #include <io.h>
 #include <windows.h>
 #endif
-#ifdef MACOSX
+#ifdef __APPLE__
 #include <mach-o/dyld.h> 
 #endif
 #include <string.h>
@@ -44,7 +44,7 @@ static char sys_dllextent[] =
 #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__GLIBC__)
     ".pd_linux";
 #endif
-#ifdef MACOSX
+#ifdef __APPLE__
     ".pd_darwin";
 #endif
 #ifdef _WIN32
@@ -67,7 +67,7 @@ static int unstable_doload_lib(char *dirname, char *classname)
     if (lastdot = strrchr(classname, '.'))
 	*lastdot = 0;
 
-#ifdef MACOSX
+#ifdef __APPLE__
     strcpy(symname, "_");
     strcat(symname, classname);
 #else
@@ -98,7 +98,7 @@ static int unstable_doload_lib(char *dirname, char *classname)
     }
     makeout = (t_xxx)GetProcAddress(ntdll, symname);  
 #endif
-#ifdef MACOSX
+#ifdef __APPLE__
     {
 	NSObjectFileImage image; 
 	void *ret;