Ticket #22621: c-toolkit-no-carbon.patch

corelib/ncbienv.c

@@ -1938 +1938 @@
 static char **targv = NULL;
 
 
-#if defined(WIN_MAC)
+#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
 static FSSpec       apFileSpec;
 static Str255       apName;
 static Handle       apParam;
@@ -2053 +2053 @@
   }
 }
 #endif /* defined(OS_UNIX_DARWIN) */
-#endif /* defined(WIN_MAC) */
+#endif /* defined(WIN_MAC) || defined(OS_UNIX_DARWIN) */
 
 
 #if defined(OS_MSWIN) || defined(OS_VMS)
@@ -2244 +2244 @@
 {
   NlmMutexLockEx( &corelibMutex );
   wasSetup = TRUE;
-#if defined(WIN_MAC)
+#if defined(WIN_MAC) || defined(OS_UNIX_DARWIN)
   wasSetup = Nlm_SetupArguments_ST_Mac();
 #elif defined(OS_UNIX)
   {{
@@ -2424 +2424 @@
   int          mib [2];
   Nlm_Char     model [32];
 #endif
-  long         sysVer;
+  Nlm_Int4     sysVer;
 #endif
   Nlm_CharPtr  str = "unknown";
 

corelib/ncbiwin.h

@@ -168 +168 @@
 #include <Sound.h>
 #include <Folders.h>
 #endif
+#elif defined(OS_UNIX_DARWIN)
+#include <CoreServices/CoreServices.h>
 #endif
 
                            /* used in ncbifile.c *****/

make/makedis.csh

@@ -240 +240 @@
                 endif
         endif
         set HAVE_MOTIF=0
-        set HAVE_MAC=1
+        # set HAVE_MAC=1
         breaksw
 case NetBSD:
         set platform=netbsd