__APPLE__ is __unix__:w

This commit is contained in:
ubu32 2011-02-14 06:51:28 -08:00
parent 17da004a5f
commit 09f4810b76

View File

@ -192,7 +192,7 @@ OsError(void)
#else /*HAVE_STRERROR*/ #else /*HAVE_STRERROR*/
static char errmsg[64]; static char errmsg[64];
#ifdef __unix__ #if defined(__unix__) || defined(__APPLE__)
extern int sys_nerr; extern int sys_nerr;
#if !EMX #if !EMX
extern char *sys_errlist[]; extern char *sys_errlist[];
@ -630,7 +630,7 @@ TemporaryFile(const char *id, int *fdp)
} }
retry: retry:
#ifdef __unix__ #if defined(_unix__) || defined(__APPLE__)
{ static int MTOK_temp_counter = 0; { static int MTOK_temp_counter = 0;
const char *sep = id[0] ? "_" : ""; const char *sep = id[0] ? "_" : "";
@ -2274,7 +2274,7 @@ Unsetenv(char *name)
an alternative. an alternative.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#ifdef __unix__ #if defined(__unix__) || defined(__APPLE__)
#define SPECIFIC_SYSTEM 1 #define SPECIFIC_SYSTEM 1
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -2482,7 +2482,7 @@ findExecutable(const char *av0, char *buffer)
return NULL; return NULL;
file = Which(buf, tmp); file = Which(buf, tmp);
#if __unix__ /* argv[0] can be an #! script! */ #if __unix__ || __APPLE__ /* argv[0] can be an #! script! */
if ( file ) if ( file )
{ int n, fd; { int n, fd;
char buf[MAXPATHLEN]; char buf[MAXPATHLEN];