diff options
| author | unknown <joerg@trift2.> | 2007-12-07 13:51:41 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-12-07 13:51:41 +0100 |
| commit | e12dbcde29e95d8e0f2ab417c8c476fa466eddb0 (patch) | |
| tree | 20d51319cc943a78ebd11682279328792fd98194 /include | |
| parent | 21fd6c0f1d79a1a1515b2837d734d37c04231d2a (diff) | |
| parent | f3514dc3c42b2fc88c336efdd4b75c90b2a08f51 (diff) | |
| download | mariadb-git-e12dbcde29e95d8e0f2ab417c8c476fa466eddb0.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/include/my_global.h b/include/my_global.h index dd3bc39413d..08877300d8a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -109,36 +109,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 - -#if defined(__i386__) -# undef 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 - -#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 - -#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__) */ /* |