diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-01-22 17:21:46 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-01-22 17:21:46 +0000 |
| commit | 465f6508d0e2df031ad33e00023cf0c2c92d7642 (patch) | |
| tree | adb654eb224955c9135bc1c8f9eab7c4c18a6a06 /shared | |
| parent | c9d724b6da2ae3aceae3896a669420ff3c804f0d (diff) | |
replace MACOSX with proper macro: __APPLE__ (https://sourceforge.net/p/predef/wiki/OperatingSystems/)
svn path=/trunk/externals/miXed/; revision=16957
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/common/mifi.c | 2 | ||||
| -rw-r--r-- | shared/sickle/sic.c | 2 | ||||
| -rw-r--r-- | shared/unstable/loader.c | 8 |
3 files changed, 6 insertions, 6 deletions
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; |