st/xorg: Fix dpms include problems

diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile
index 030bac5fff2f74fbad933d822c48fb99c9e15d29..27a1990724d4cfa220091a2afa3a56608ebfefe7 100644 (file)
--- a/src/gallium/state_trackers/xorg/Makefile
+++ b/src/gallium/state_trackers/xorg/Makefile
@@ -5,7 +5,6 @@ LIBNAME = xorgtracker
 
 LIBRARY_INCLUDES = \
        -DHAVE_CONFIG_H \
-        -DHAVE_XEXTPROTO_71=1 \
        $(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/auxiliary \

diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 95973586da88aa7f6610c0a01702c51a8ff4a020..67fe29a69dab535eed641bdf6fc9d14d5a2e492e 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -43,10 +43,10 @@
 #include "xf86Modes.h"
 
 #ifdef HAVE_XEXTPROTO_71
-#include "X11/extensions/dpmsconst.h"
+#include <X11/extensions/dpmsconst.h>
 #else
 #define DPMS_SERVER
-#include "X11/extensions/dpmsconst.h"
+#include <X11/extensions/dpms.h>
 #endif
 
 #include "pipe/p_inlines.h"