--- ncbi/corelib/ncbienv.c	17 Aug 2009 19:56:13 -0000
+++ ncbi/corelib/ncbienv.c	9 Nov 2009 18:44:01 -0000
@@ -1938,7 +1938,7 @@
 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,7 +2053,7 @@
   }
 }
 #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,7 +2244,7 @@
 {
   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,7 +2424,7 @@
   int          mib [2];
   Nlm_Char     model [32];
 #endif
-  long         sysVer;
+  Nlm_Int4     sysVer;
 #endif
   Nlm_CharPtr  str = "unknown";
 
--- ncbi/corelib/ncbiwin.h	24 Nov 2006 20:05:36 -0000
+++ ncbi/corelib/ncbiwin.h	9 Nov 2009 18:44:01 -0000
@@ -168,6 +168,8 @@
 #include <Sound.h>
 #include <Folders.h>
 #endif
+#elif defined(OS_UNIX_DARWIN)
+#include <CoreServices/CoreServices.h>
 #endif
 
 	                   /* used in ncbifile.c *****/
--- ncbi/make/makedis.csh	23 Mar 2009 17:10:14 -0000
+++ ncbi/make/makedis.csh	9 Nov 2009 18:44:01 -0000
@@ -240,7 +240,7 @@
 		endif
 	endif
 	set HAVE_MOTIF=0
-	set HAVE_MAC=1
+	# set HAVE_MAC=1
 	breaksw
 case NetBSD:
 	set platform=netbsd
