Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build

into mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.1-build

Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
into mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.1-build
4814970b · kent@kent-amd64.(none) · 294ab4c6 · 36c5e530 · 4814970b
Commit 4814970b authored Nov 30, 2007 by kent@kent-amd64.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 47 deletions

include/my_global.h include/my_global.h +25 -47

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -116,53 +116,31 @@
  The macros below are used to allow build of Universal/fat binaries of
  MySQL and MySQL applications under darwin. 
 */
-#ifdef TARGET_FAT_BINARY
+#if defined(__APPLE__) && defined(__MACH__)
-# undef SIZEOF_CHARP 
+#  undef SIZEOF_CHARP 
-# undef SIZEOF_INT 
+#  undef SIZEOF_SHORT 
-# undef SIZEOF_LONG 
+#  undef SIZEOF_INT 
-# undef SIZEOF_LONG_LONG 
+#  undef SIZEOF_LONG 
-# undef SIZEOF_OFF_T 
+#  undef SIZEOF_LONG_LONG 
-# undef SIZEOF_SHORT 
+#  undef SIZEOF_OFF_T 
-# undef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+#  define SIZEOF_SHORT 2
-#if defined(__i386__)
+#  define SIZEOF_INT 4
-# define SIZEOF_CHARP 4
+#  define SIZEOF_LONG_LONG 8
-# define SIZEOF_INT 4
+#  define SIZEOF_OFF_T 8
-# define SIZEOF_LONG 4
+#  if defined(__i386__) || defined(__ppc__)
-# define SIZEOF_LONG_LONG 8
+#    define SIZEOF_CHARP 4
-# define SIZEOF_OFF_T 8
+#    define SIZEOF_LONG 4
-# define SIZEOF_SHORT 2
+#  elif defined(__x86_64__) || defined(__ppc64__)
+#    define SIZEOF_CHARP 8
-#elif defined(__ppc__)
+#    define SIZEOF_LONG 8
-# define WORDS_BIGENDIAN
+#  else
-# define SIZEOF_CHARP 4
+#    error Building FAT binary for an unknown architecture.
-# define SIZEOF_INT 4
+#  endif
-# define SIZEOF_LONG 4
+#  if defined(__ppc__) || defined(__ppc64__)
-# define SIZEOF_LONG_LONG 8
+#    define WORDS_BIGENDIAN
-# define SIZEOF_OFF_T 8
+#  endif
-# define SIZEOF_SHORT 2
+#endif /* defined(__APPLE__) && defined(__MACH__) */
-#if defined(__x86_64__)
-# define SIZEOF_CHARP 8
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 8
-# define SIZEOF_LONG_LONG 8
-# define SIZEOF_OFF_T 8
-# define SIZEOF_SHORT 2
-#elif defined(__ppc64__)
-# define WORDS_BIGENDIAN
-# define SIZEOF_CHARP 8
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 8
-# 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 */
 /*