summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-10-13 11:56:35 +0200
committerJakob Bornecrantz <jakob@vmware.com>2009-10-13 19:16:21 +0200
commitef067b5f01eb7ea7a08a64d897e0e70e139c618d (patch)
tree5f760de90b923564c45f73c935b5c1c14c14ba22 /src/gallium
parent5c4bdbd825934fe01330890d360b61caa06fdc8d (diff)
st/xorg: Fix dpms include problems
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/xorg/Makefile1
-rw-r--r--src/gallium/state_trackers/xorg/xorg_crtc.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile
index 030bac5fff..27a1990724 100644
--- 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 95973586da..67fe29a69d 100644
--- 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"