diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-11-29 23:44:16 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-11-29 23:44:16 +0100 |
| commit | 12ab96a2796a63ba57fb884b4217285402abbfff (patch) | |
| tree | c0118a12730b559fbbdf8078d626f0a30dfe21ea /include | |
| parent | 8b76c0001bde0d2e119539fb86850745e8fe07b2 (diff) | |
| parent | f177f5f9a5a0416f06dcf5e95ef58dcfe3edb043 (diff) | |
| download | mariadb-git-12ab96a2796a63ba57fb884b4217285402abbfff.tar.gz | |
Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build
into mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
include/my_global.h:
Auto merged
Diffstat (limited to 'include')
| -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 dd3bc39413d..e0f8658f905 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -116,9 +116,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 @@ -135,6 +135,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 |