fix __APPLE__ usage and wrong mv.

os/pl-os.c

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