summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorunknown <mmj@tiger.mmj.dk>2007-01-04 23:18:04 +0100
committerunknown <mmj@tiger.mmj.dk>2007-01-04 23:18:04 +0100
commit679402dab66b96a6f815f33342127384b1b4af58 (patch)
tree479598c9505802d42f25e8728dc1c4694de951aa /include/my_global.h
parent19a33e08f2da6692e4f1e18b8b0b627df4ae5ac5 (diff)
downloadmariadb-git-679402dab66b96a6f815f33342127384b1b4af58.tar.gz
my_global.h:
Patch from Alfredo for TARGET_FAT_BINARY include/my_global.h: Patch from Alfredo for TARGET_FAT_BINARY
Diffstat (limited to 'include/my_global.h')
-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 41b660227b5..2de54e521b5 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -85,6 +85,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