From 8376a21804f9c15fd412ffd0f024c6c5239412f1 Mon Sep 17 00:00:00 2001
From: Alexei Svitkine <alexei.svitkine@gmail.com>
Date: Wed, 4 Jul 2012 22:22:00 -0400
Subject: [PATCH] Fix build with SnowLeopard SDK.

---
 BasiliskII/src/MacOSX/video_macosx.mm | 4 ++--
 BasiliskII/src/Unix/sysdeps.h         | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/BasiliskII/src/MacOSX/video_macosx.mm b/BasiliskII/src/MacOSX/video_macosx.mm
index be69060b..d4eff082 100644
--- a/BasiliskII/src/MacOSX/video_macosx.mm
+++ b/BasiliskII/src/MacOSX/video_macosx.mm
@@ -704,7 +704,7 @@ OSX_monitor::init_screen(video_mode &mode)
 		mode.bytes_per_row = CGDisplayBytesPerRow(theDisplay);
 	}
 
-	HideMenuBar();
+	[NSMenu setMenuBarVisible:NO];
 
 	if ( singleDisplay )
 	{
@@ -883,7 +883,7 @@ OSX_monitor::video_close()
 			{
 				if ( singleDisplay )
 					CGDisplayShowCursor(theDisplay);
-				ShowMenuBar();
+				[NSMenu setMenuBarVisible:YES];
 				CGDisplaySwitchToMode(theDisplay, originalMode);
 				CGDisplayRelease(theDisplay);
 				//[the_win deminiaturize: nil];
diff --git a/BasiliskII/src/Unix/sysdeps.h b/BasiliskII/src/Unix/sysdeps.h
index 10a085bd..f53293a7 100644
--- a/BasiliskII/src/Unix/sysdeps.h
+++ b/BasiliskII/src/Unix/sysdeps.h
@@ -149,12 +149,18 @@ typedef long int32;
 #error "No 4 byte type, you lose."
 #endif
 #if SIZEOF_LONG == 8
+#ifndef _UINT64
 typedef unsigned long uint64;
+#define _UINT64
+#endif
 typedef long int64;
 #define VAL64(a) (a ## l)
 #define UVAL64(a) (a ## ul)
 #elif SIZEOF_LONG_LONG == 8
+#ifndef _UINT64
 typedef unsigned long long uint64;
+#define _UINT64
+#endif
 typedef long long int64;
 #define VAL64(a) (a ## LL)
 #define UVAL64(a) (a ## uLL)