From 2ea738ebc50ebe8f881373ea28e271a1555f2a92 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri, 30 Jan 2009 09:25:54 -0800
Subject: [PATCH] Nuke dix-config-post-verbatim.h (cherry picked from commit
 d7a2d6a8021525ad09234ab54dd8be9a743b73c3)

---
 include/dix-config-post-verbatim.h | 10 ----------
 include/dix-config.h.in            |  9 ++++++++-
 2 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 include/dix-config-post-verbatim.h

diff --git a/include/dix-config-post-verbatim.h b/include/dix-config-post-verbatim.h
deleted file mode 100644
index 4bbb9b031..000000000
--- a/include/dix-config-post-verbatim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* 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 06fdc438f..bded111d9 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -494,6 +494,13 @@
 /* Define to 64-bit byteswap macro */
 #undef bswap_64
 
-#include <dix-config-post-verbatim.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
 
 #endif /* _DIX_CONFIG_H_ */