diff options
| -rw-r--r-- | hints/darwin.sh | 4 | ||||
| -rw-r--r-- | perl.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/hints/darwin.sh b/hints/darwin.sh index 025c0221f1..59f0d63050 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -85,10 +85,10 @@ esac # -pipe: makes compilation go faster. # -fno-common because common symbols are not allowed in MH_DYLIB -# -DDARWIN: apparently the __APPLE__ is not sanctioned by Apple +# -DPERL_DARWIN: apparently the __APPLE__ is not sanctioned by Apple # as the way to differentiate Mac OS X. (The official line is that # *no* cpp symbol does differentiate Mac OS X.) -ccflags="${ccflags} -pipe -fno-common -DDARWIN" +ccflags="${ccflags} -pipe -fno-common -DPERL_DARWIN" # At least on Darwin 1.3.x: # @@ -73,18 +73,18 @@ /* Use the reentrant APIs like localtime_r and getpwent_r */ /* Win32 has naturally threadsafe libraries, no need to use any _r variants. */ -#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(NETWARE) && !defined(WIN32) && !defined(DARWIN) +#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(NETWARE) && !defined(WIN32) && !defined(PERL_DARWIN) # define USE_REENTRANT_API #endif /* <--- here ends the logic shared by perl.h and makedef.pl */ /* - * DARWIN for MacOSX (__APPLE__ exists but is not officially sanctioned) - * (The -DDARWIN comes from the hints/darwin.sh.) + * PERL_DARWIN for MacOSX (__APPLE__ exists but is not officially sanctioned) + * (The -DPERL_DARWIN comes from the hints/darwin.sh.) * __bsdi__ for BSD/OS */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(DARWIN) || defined(__bsdi__) || defined(BSD41) || defined(BSD42) || defined(BSD43) || defined(BSD44) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(PERL_DARWIN) || defined(__bsdi__) || defined(BSD41) || defined(BSD42) || defined(BSD43) || defined(BSD44) # ifndef BSDish # define BSDish # endif @@ -2947,13 +2947,13 @@ typedef OP* (CPERLscope(*PPADDR_t)[]) (pTHX); /* NeXT has problems with crt0.o globals */ #if defined(__DYNAMIC__) && \ - (defined(NeXT) || defined(__NeXT__) || defined(DARWIN)) + (defined(NeXT) || defined(__NeXT__) || defined(PERL_DARWIN)) # if defined(NeXT) || defined(__NeXT) # include <mach-o/dyld.h> # define environ (*environ_pointer) EXT char *** environ_pointer; # else -# if defined(DARWIN) && defined(PERL_CORE) +# if defined(PERL_DARWIN) && defined(PERL_CORE) # include <crt_externs.h> /* for the env array */ # define environ (*_NSGetEnviron()) # endif |