[Unison-hackers] [unison-svn] r418 - trunk/src/uimacnew09

[schmitta@seas.upenn.edu]

Author: schmitta
Date: 2010-02-24 09:34:18 -0500 (Wed, 24 Feb 2010)
New Revision: 418

Modified:
   trunk/src/uimacnew09/Bridge.m
   trunk/src/uimacnew09/MyController.m
Log:
Workaround an incompatibility between ocaml 3.11.2 (and earlier) and OS X headers when compiling for 64 bits intel.



Modified: trunk/src/uimacnew09/Bridge.m
===================================================================
--- trunk/src/uimacnew09/Bridge.m	2010-02-24 14:19:23 UTC (rev 417)
+++ trunk/src/uimacnew09/Bridge.m	2010-02-24 14:34:18 UTC (rev 418)
@@ -7,6 +7,12 @@
 //
 
 #import "Bridge.h"
+
+/* The following two define are a workaround for an incompatibility between
+ Ocaml 3.11.2 (and older) and the Mac OS X header files */
+#define uint64 uint64_caml
+#define int64 int64_caml
+
 #define CAML_NAME_SPACE
 #include <caml/callback.h>
 #include <caml/alloc.h>

Modified: trunk/src/uimacnew09/MyController.m
===================================================================
--- trunk/src/uimacnew09/MyController.m	2010-02-24 14:19:23 UTC (rev 417)
+++ trunk/src/uimacnew09/MyController.m	2010-02-24 14:34:18 UTC (rev 418)
@@ -2,6 +2,11 @@
 
 #import "MyController.h"
 
+/* The following two define are a workaround for an incompatibility between
+Ocaml 3.11.2 (and older) and the Mac OS X header files */
+#define uint64 uint64_caml
+#define int64 int64_caml
+
 #define CAML_NAME_SPACE
 #include <caml/callback.h>
 #include <caml/alloc.h>