diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-07 10:56:26 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-09 11:03:37 -0800 |
| commit | 4130761f151ff5414694472e1dc29d8f2893f10e (patch) | |
| tree | 443db8b41c92d19f8b5143714732f09842331142 /include | |
| parent | 2eb09af56179d570a6d52b65c2029a2b62dcdff3 (diff) | |
XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0b537c8322ecb2db8e9cee5eea68165)
(cherry picked from commit cc677cb4f458f371a4012ce0dc1121a52a2cb699)
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config-post-verbatim.h | 10 | ||||
| -rw-r--r-- | include/dix-config.h.in | 15 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 13 |
3 files changed, 12 insertions, 26 deletions
diff --git a/include/dix-config-post-verbatim.h b/include/dix-config-post-verbatim.h new file mode 100644 index 000000000..4bbb9b031 --- /dev/null +++ b/include/dix-config-post-verbatim.h @@ -0,0 +1,10 @@ +/* Do not include this file directly. It is included at the end of <dix-config.h> */ + +/* Correctly set _XSERVER64 for OSX fat binaries */ +#ifdef __APPLE__ +#if defined(__LP64__) && !defined(_XSERVER64) +#define _XSERVER64 1 +#elif !defined(__LP64__) && defined(_XSERVER64) +#undef _XSERVER64 +#endif +#endif diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 65b595076..977bff3e9 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -363,19 +363,6 @@ /* Vendor name */ #undef XVENDORNAME -/* Endian order */ -#undef _X_BYTE_ORDER -/* Deal with multiple architecture compiles on Mac OS X */ -#ifndef __APPLE_CC__ -#define X_BYTE_ORDER _X_BYTE_ORDER -#else -#ifdef __BIG_ENDIAN__ -#define X_BYTE_ORDER X_BIG_ENDIAN -#else -#define X_BYTE_ORDER X_LITTLE_ENDIAN -#endif -#endif - /* Enable GNU and other extensions to the C environment for GLIBC */ #undef _GNU_SOURCE @@ -442,4 +429,6 @@ /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +#include <dix-config-post-verbatim.h> + #endif /* _DIX_CONFIG_H_ */ diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index b8803e748..4cf1bbf0e 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -145,19 +145,6 @@ /* Vendor name */ #undef XVENDORNAME -/* Endian order */ -#undef _X_BYTE_ORDER -/* Deal with multiple architecture compiles on Mac OS X */ -#ifndef __APPLE_CC__ -#define X_BYTE_ORDER _X_BYTE_ORDER -#else -#ifdef __BIG_ENDIAN__ -#define X_BYTE_ORDER X_BIG_ENDIAN -#else -#define X_BYTE_ORDER X_LITTLE_ENDIAN -#endif -#endif - /* BSD-compliant source */ #undef _BSD_SOURCE |