diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-11-29 23:45:28 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-11-29 23:45:28 +0100 |
| commit | d1e1c682c7a6c0b33852118ae4d470eddaa7daf5 (patch) | |
| tree | 0f8cf839e9be95276a69e06d2c6005b345c4e9fb /include/my_global.h | |
| parent | 590d9274feb063e65000d6c23f6cdcf200456dd5 (diff) | |
| parent | 12ab96a2796a63ba57fb884b4217285402abbfff (diff) | |
| download | mariadb-git-d1e1c682c7a6c0b33852118ae4d470eddaa7daf5.tar.gz | |
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
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index ce76aeaec20..492a0e78e7e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -123,9 +123,9 @@ # undef SIZEOF_LONG_LONG # undef SIZEOF_OFF_T # undef SIZEOF_SHORT +# undef WORDS_BIGENDIAN #if defined(__i386__) -# undef WORDS_BIGENDIAN # define SIZEOF_CHARP 4 # define SIZEOF_INT 4 # define SIZEOF_LONG 4 @@ -142,6 +142,23 @@ # define SIZEOF_OFF_T 8 # 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 # error Building FAT binary for an unknown architecture. #endif |