xserver: Branch 'master'

[Keith Packard]

 include/xorg-server.h.in |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e8373e4b6a793b48487b1a82d798d97b5c9a10a3
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jul 31 19:57:53 2014 -0700

    Add X_BYTE_ORDER to xorg-server.h
    
    Drivers don't get to use dix-config.h, they use xorg-server.h
    instead. Add X_BYTE_ORDER to that file so drivers can see the value.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 09b79b6..4cb9487 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -231,4 +231,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_ */