From e31564e1a21e73f4d20d6471da4fc7a9b63e4062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 31 Jul 2014 08:35:13 -0700 Subject: [PATCH] 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 Signed-off-by: Keith Packard --- include/servermd.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/servermd.h b/include/servermd.h index 0132d67bf..c88a5428d 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