Commit 36c5e530 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)
Browse files

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
parents c0b8aa41 666ec84b
Loading
Loading
Loading
Loading
+25 −47
Original line number Diff line number Diff line
@@ -109,53 +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
#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 SIZEOF_SHORT 
#  undef WORDS_BIGENDIAN

#if defined(__i386__)
# define SIZEOF_CHARP 4
#  define SIZEOF_SHORT 2
#  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
#  if defined(__i386__) || defined(__ppc__)
#    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__)
#  elif defined(__x86_64__) || defined(__ppc64__)
#    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(__ppc__) || defined(__ppc64__)
#    define WORDS_BIGENDIAN
#  endif
#endif /* defined(__APPLE__) && defined(__MACH__) */


/*