Commit c0b8aa41 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 3214b7c2 369d75dc

include/my_global.h

+18 −1
Original line number Diff line number Diff line
@@ -116,9 +116,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
@@ -135,6 +135,23 @@ 
# 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