diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-11-30 01:38:29 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-11-30 01:38:29 +0100 |
| commit | 0d09e36479cbb05d295c025631b0b04c3aecc46c (patch) | |
| tree | 3f5b4c46a17725a40be2a94d1a6b531e9ea5b0e1 /include/my_global.h | |
| parent | d1e1c682c7a6c0b33852118ae4d470eddaa7daf5 (diff) | |
| parent | 8ffb5404531f97cec88c1b57b9d3987069c5b0ef (diff) | |
| download | mariadb-git-0d09e36479cbb05d295c025631b0b04c3aecc46c.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 | 72 |
1 files changed, 25 insertions, 47 deletions
diff --git a/include/my_global.h b/include/my_global.h index 492a0e78e7e..4b0786aa826 100644 --- 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 -# undef SIZEOF_CHARP -# undef SIZEOF_INT -# undef SIZEOF_LONG -# undef SIZEOF_LONG_LONG -# undef SIZEOF_OFF_T -# undef SIZEOF_SHORT -# undef WORDS_BIGENDIAN - -#if defined(__i386__) -# define SIZEOF_CHARP 4 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 4 -# define SIZEOF_LONG_LONG 8 -# define SIZEOF_OFF_T 8 -# define SIZEOF_SHORT 2 - -#elif defined(__ppc__) -# define WORDS_BIGENDIAN -# define SIZEOF_CHARP 4 -# define SIZEOF_INT 4 -# define SIZEOF_LONG 4 -# define SIZEOF_LONG_LONG 8 -# 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 -#endif /* TARGET_FAT_BINARY */ +#if defined(__APPLE__) && defined(__MACH__) +# undef SIZEOF_CHARP +# undef SIZEOF_SHORT +# undef SIZEOF_INT +# undef SIZEOF_LONG +# undef SIZEOF_LONG_LONG +# undef SIZEOF_OFF_T +# undef WORDS_BIGENDIAN +# define SIZEOF_SHORT 2 +# define SIZEOF_INT 4 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_OFF_T 8 +# if defined(__i386__) || defined(__ppc__) +# define SIZEOF_CHARP 4 +# define SIZEOF_LONG 4 +# elif defined(__x86_64__) || defined(__ppc64__) +# define SIZEOF_CHARP 8 +# define SIZEOF_LONG 8 +# else +# error Building FAT binary for an unknown architecture. +# endif +# if defined(__ppc__) || defined(__ppc64__) +# define WORDS_BIGENDIAN +# endif +#endif /* defined(__APPLE__) && defined(__MACH__) */ /* |