[PATCH] Make sure X_BYTE_ORDER is defined for servermd.h

[Keith Packard]

Use dix-config.h when present, otherwise use xorg-server.h

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 include/servermd.h       | 4 ++++
 include/xorg-server.h.in | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/include/servermd.h b/include/servermd.h
index 0132d67..b3fe6df 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,7 +47,11 @@ SOFTWARE.
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
+#ifdef HAVE_DIX_CONFIG_H
 #include "dix-config.h"
+#else
+#include "xorg-server.h"
+#endif
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
 #define IMAGE_BYTE_ORDER        LSBFirst
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 8bf9d38..fcdbcfd 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -227,4 +227,7 @@
 /* Ask fontsproto to make font path element names const */
 #define FONT_PATH_ELEMENT_NAME_CONST    1
 
+/* byte order */
+#undef X_BYTE_ORDER
+
 #endif /* _XORG_SERVER_H_ */
-- 
2.0.1