xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Jan 7 10:51:47 PST 2009
configure.ac | 13 -------------
include/dix-config-post-verbatim.h | 10 ++++++++++
include/dix-config.h.in | 15 ++-------------
include/xorg-server.h.in | 13 -------------
4 files changed, 12 insertions(+), 39 deletions(-)
New commits:
commit f54736c2b0b537c8322ecb2db8e9cee5eea68165
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Jan 7 10:50:35 2009 -0800
XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
diff --git a/configure.ac b/configure.ac
index 4d0f87c..1f00643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1157,19 +1157,6 @@ AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
-AC_DEFINE_UNQUOTED(_X_BYTE_ORDER,[$ENDIAN],[Endian order])
-AH_VERBATIM([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
-])
AC_SUBST([XSERVER_LIBS])
diff --git a/include/dix-config-post-verbatim.h b/include/dix-config-post-verbatim.h
new file mode 100644
index 0000000..4bbb9b0
--- /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 f5097bf..06fdc43 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -431,19 +431,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
@@ -507,4 +494,6 @@
/* Define to 64-bit byteswap macro */
#undef bswap_64
+#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 3c2ff47..b23d2d3 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -190,19 +190,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
More information about the xorg-commit
mailing list