From 7e7827a886e6771adbe97deb30a592c9df3b8e2f Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sun, 30 Dec 2007 09:15:32 +0000
Subject: [PATCH] More overrides for MacOS X.

---
 BasiliskII/src/MacOSX/extfs_macosx.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/BasiliskII/src/MacOSX/extfs_macosx.cpp b/BasiliskII/src/MacOSX/extfs_macosx.cpp
index 2ebf258e..270bba33 100644
--- a/BasiliskII/src/MacOSX/extfs_macosx.cpp
+++ b/BasiliskII/src/MacOSX/extfs_macosx.cpp
@@ -33,8 +33,15 @@
 #include "extfs.h"
 #include "extfs_defs.h"
 
-#define noErr native_noErr
-#include <CoreFoundation/CFString.h>
+// XXX: don't clobber with native definitions
+#define noErr	native_noErr
+#define Point	native_Point
+#define Rect	native_Rect
+#define ProcPtr	native_ProcPtr
+# include <CoreFoundation/CFString.h>
+#undef ProcPtr
+#undef Rect
+#undef Point
 #undef noErr
 
 #define DEBUG 0