projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
state_trackers
/
xorg
/
xorg_crtc.c
diff --git
a/src/gallium/state_trackers/xorg/xorg_crtc.c
b/src/gallium/state_trackers/xorg/xorg_crtc.c
index fe08bde9efc736de740e38cc1267234a50e89841..67fe29a69dab535eed641bdf6fc9d14d5a2e492e 100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/
src/gallium/state_trackers/xorg/xorg_crtc.c
@@
-42,8
+42,12
@@
#include "xorg_tracker.h"
#include "xf86Modes.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
#include "pipe/p_inlines.h"
#include "util/u_rect.h"