diff options
| author | kent@kent-amd64.(none) <> | 2007-11-29 23:44:16 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2007-11-29 23:44:16 +0100 |
| commit | c0b8aa419b303ac7f3b3cab57e1a4da78ebee8bc (patch) | |
| tree | c0118a12730b559fbbdf8078d626f0a30dfe21ea /include | |
| parent | 3214b7c2864fa829ff230f7e1abc6d4605a9e20a (diff) | |
| parent | 369d75dc754c9f96d83b3897e0ce62c310f1b9ef (diff) | |
| download | mariadb-git-c0b8aa419b303ac7f3b3cab57e1a4da78ebee8bc.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
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 |