summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <mmj@tiger.mmj.dk>2007-01-04 22:22:25 +0100
committerunknown <mmj@tiger.mmj.dk>2007-01-04 22:22:25 +0100
commitc9f42a9bfaad60fd480feb9c1dde72c826ccfe6b (patch)
tree93238897e5b6b5e7853c76ee97b50e6473792c00 /include
parent0f09b9ce7fddc02138d019a36d4c1fc26f218f37 (diff)
downloadmariadb-git-c9f42a9bfaad60fd480feb9c1dde72c826ccfe6b.tar.gz
my_global.h:
Add patch from Alfredo for TARGET_FAT_BINARY include/my_global.h: Add patch from Alfredo for TARGET_FAT_BINARY
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h36
1 files changed, 36 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 19ba37fd58b..2a2b4a2ba99 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -93,6 +93,42 @@
#endif
/*
+ The macros below are used to allow build of Universal/fat binaries of
+ MySQL and MySQL applications under darwin.
+*/
+#ifdef TARGET_FAT_BINARY
+# undef SIZEOF_CHARP
+# undef SIZEOF_INT
+# undef SIZEOF_LONG
+# undef SIZEOF_LONG_LONG
+# undef SIZEOF_OFF_T
+# undef SIZEOF_SHORT
+
+#if defined(__i386__)
+# undef WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#elif defined(__ppc__)
+# define WORDS_BIGENDIAN
+# define SIZEOF_CHARP 4
+# define SIZEOF_INT 4
+# define SIZEOF_LONG 4
+# define SIZEOF_LONG_LONG 8
+# define SIZEOF_OFF_T 8
+# define SIZEOF_SHORT 2
+
+#else
+# error Building FAT binary for an unknown architecture.
+#endif
+#endif /* TARGET_FAT_BINARY */
+
+
+/*
The macros below are borrowed from include/linux/compiler.h in the
Linux kernel. Use them to indicate the likelyhood of the truthfulness
of a condition. This serves two purposes - newer versions of gcc will be