From 61f57730a8bb64e607e42d74fac76f6cd8b3b021 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 01:22:15 +0100 Subject: Excluded verbose and bad change to Mac OS X universal binaries handling --- include/my_global.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'include') diff --git a/include/my_global.h b/include/my_global.h index 7bd82533575..5e31a66e5e3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -95,9 +95,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 @@ -114,23 +114,6 @@ # 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 -- cgit v1.2.1 From 44ebdc095a5577ef4dabd2b0c39c5f2a7d4c12d1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 Nov 2007 01:36:05 +0100 Subject: my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries include/my_global.h: Added 64 bit Mac OS X hard coded settings, for universal binaries --- include/my_global.h | 55 ++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/my_global.h b/include/my_global.h index 5e31a66e5e3..ebc725c300d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -88,36 +88,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__) */ /* -- cgit v1.2.1