Commit d1e1c682 authored by unknown's avatar unknown

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


include/my_global.h:
  Auto merged
parents 590d9274 12ab96a2
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
# undef SIZEOF_LONG_LONG # undef SIZEOF_LONG_LONG
# undef SIZEOF_OFF_T # undef SIZEOF_OFF_T
# undef SIZEOF_SHORT # undef SIZEOF_SHORT
# undef WORDS_BIGENDIAN
#if defined(__i386__) #if defined(__i386__)
# undef WORDS_BIGENDIAN
# define SIZEOF_CHARP 4 # define SIZEOF_CHARP 4
# define SIZEOF_INT 4 # define SIZEOF_INT 4
# define SIZEOF_LONG 4 # define SIZEOF_LONG 4
...@@ -142,6 +142,23 @@ ...@@ -142,6 +142,23 @@
# define SIZEOF_OFF_T 8 # define SIZEOF_OFF_T 8
# define SIZEOF_SHORT 2 # define SIZEOF_SHORT 2
#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 #else
# error Building FAT binary for an unknown architecture. # error Building FAT binary for an unknown architecture.
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment