[PATCH] servermd.h: Guard #include "dix-config.h" by HAVE_DIX_CONFIG_H

Michel Dänzer michel at daenzer.net
Thu Jul 24 19:57:29 PDT 2014


From: Michel Dänzer <michel.daenzer at amd.com>

Fixes driver build failure against current xserver Git:

In file included from /usr/local/include/xorg/randrstr.h:46:0,
                 from ../../src/radeon_probe.h:43,
                 from ../../src/radeon_misc.c:27:
/usr/local/include/xorg/servermd.h:50:24: fatal error: dix-config.h: No such file or directory
 #include "dix-config.h"
                        ^

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 include/servermd.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/servermd.h b/include/servermd.h
index 0132d67..eca5cb0 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -47,7 +47,9 @@ SOFTWARE.
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
+#ifdef HAVE_DIX_CONFIG_H
 #include "dix-config.h"
+#endif
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
 #define IMAGE_BYTE_ORDER        LSBFirst
-- 
2.0.0



More information about the xorg-devel mailing list