summaryrefslogtreecommitdiff
path: root/src/ch7xxx/ch7xxx.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-16 11:40:15 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-18 12:10:18 +1000
commit0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 (patch)
tree976dd107999f66b46b82a6d1d006a4b72749b153 /src/ch7xxx/ch7xxx.c
parent57c7cbade9556e7b21867e61353f0928fd553616 (diff)
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's not exported by the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/ch7xxx/ch7xxx.c')
-rw-r--r--src/ch7xxx/ch7xxx.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c
index 8a439e42..13ba1020 100644
--- a/src/ch7xxx/ch7xxx.c
+++ b/src/ch7xxx/ch7xxx.c
@@ -39,8 +39,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "miscstruct.h"
#include "xf86i2c.h"
#include "xf86Crtc.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include "../i2c_vid.h"
#include "ch7xxx.h"