[Unison-hackers] [unison-svn] r414 - trunk/src/uimacnew

[schmitta@seas.upenn.edu]

Author: schmitta
Date: 2010-02-24 05:16:58 -0500 (Wed, 24 Feb 2010)
New Revision: 414

Modified:
   trunk/src/uimacnew/Bridge.m
   trunk/src/uimacnew/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/uimacnew/Bridge.m
===================================================================
--- trunk/src/uimacnew/Bridge.m	2010-02-23 02:59:23 UTC (rev 413)
+++ trunk/src/uimacnew/Bridge.m	2010-02-24 10:16:58 UTC (rev 414)
@@ -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/uimacnew/MyController.m
===================================================================
--- trunk/src/uimacnew/MyController.m	2010-02-23 02:59:23 UTC (rev 413)
+++ trunk/src/uimacnew/MyController.m	2010-02-24 10:16:58 UTC (rev 414)
@@ -11,6 +11,11 @@
 #import "ProgressCell.h"
 #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>