Commit 666ec84b authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

my_global.h:

  Added 64 bit Mac OS X hard coded settings, for universal binaries
parent 611b737a
Loading
Loading
Loading
Loading
+25 −30
Original line number Diff line number Diff line
@@ -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
#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 

#if defined(__i386__)
#  undef WORDS_BIGENDIAN
# 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

#  elif defined(__x86_64__) || defined(__ppc64__)
#    define SIZEOF_CHARP 8
#    define SIZEOF_LONG 8
#  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__) */


/*