xserver: Branch 'master'

[Keith Packard]

 include/servermd.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e31564e1a21e73f4d20d6471da4fc7a9b63e4062
Author: Michel Dänzer <michel at daenzer.net>
Date:   Thu Jul 31 08:35:13 2014 -0700

    Check for dix-config.h or xorg-server.h before using X_BYTE_ORDER
    
    Now that servermd.h depends on X_BYTE_ORDER being defined in
    dix-config.h or xorg-server.h, check to make sure one of those has
    been included before using the value.
    
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/servermd.h b/include/servermd.h
index 0132d67..c88a542 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,7 +47,10 @@ SOFTWARE.
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
-#include "dix-config.h"
+#if !defined(_DIX_CONFIG_H_) && !defined(_XORG_SERVER_H_)
+#error Drivers must include xorg-server.h before any other xserver headers
+#error xserver code must include dix-config.h before any other headers
+#endif
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
 #define IMAGE_BYTE_ORDER        LSBFirst