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

@@ -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 {

BasiliskII/src/MacOSX/macos_util_macosx.h

@@ -28,7 +28,7 @@
 
 #include "cpu_emulation.h"
 
-#import <CarbonCore/OSUtils.h>
+#import <Carbon/Carbon.h>
 
 /*
  *  Queues