From cd159591409d9d91d8f49c0fba77f46768defd40 Mon Sep 17 00:00:00 2001
From: nigel <>
Date: Wed, 28 Jan 2004 07:29:38 +0000
Subject: [PATCH] John Daniel's changes; CarbonCore is hard to find (sub
 framework of the CoreServices framework).  Easier to include full Carbon
 header instead (and remove extra defs).

---
 BasiliskII/src/MacOSX/extfs_macosx.h      | 20 +-------------------
 BasiliskII/src/MacOSX/macos_util_macosx.h |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/BasiliskII/src/MacOSX/extfs_macosx.h b/BasiliskII/src/MacOSX/extfs_macosx.h
index 539c9267..8e393ef4 100644
--- a/BasiliskII/src/MacOSX/extfs_macosx.h
+++ b/BasiliskII/src/MacOSX/extfs_macosx.h
@@ -29,25 +29,7 @@
 
 #include "macos_util_macosx.h"
 
-#import <CarbonCore/Files.h>   
-
-
-// Gestalt selectors
-enum {
-	gestaltFSAttr				= FOURCC('f','s',' ',' '),
-	gestaltFullExtFSDispatching	= 0,
-	gestaltHasFSSpecCalls		= 1,
-	gestaltHasFileSystemManager	= 2,
-	gestaltFSMDoesDynamicLoad	= 3,
-	gestaltFSSupports4GBVols	= 4,
-	gestaltFSSupports2TBVols	= 5,
-	gestaltHasExtendedDiskInit	= 6,
-	gestaltDTMgrSupportsFSM		= 7
-};
-
-enum {
-	gestaltFSMVersion			= FOURCC('f','s','m',' ')
-};
+#import <Carbon/Carbon.h>   
 
 // File attributes
 enum {
diff --git a/BasiliskII/src/MacOSX/macos_util_macosx.h b/BasiliskII/src/MacOSX/macos_util_macosx.h
index 64114355..b4e3affa 100644
--- a/BasiliskII/src/MacOSX/macos_util_macosx.h
+++ b/BasiliskII/src/MacOSX/macos_util_macosx.h
@@ -28,7 +28,7 @@
 
 #include "cpu_emulation.h"
 
-#import <CarbonCore/OSUtils.h>
+#import <Carbon/Carbon.h>
 
 /*
  *  Queues