From d3f6b43a240eb763025b3cbf546cb7ae502c94fa Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 15 Jul 2009 16:51:05 +1000
Subject: Update to xextproto 7.0.99.1.

xextproto had Xlib client headers moved into libXext.
Protocol header files are named fooproto.h, header files with constants
foo.h or fooconst.h where foo.h was already in use for client-side headers.
---
 mi/mieq.c      | 3 +--
 mi/miinitext.c | 8 +++-----
 mi/miscrinit.c | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'mi')

diff --git a/mi/mieq.c b/mi/mieq.c
index fd2de0e24..f9ceab2fa 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -54,8 +54,7 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef DPMSExtension
 # include "dpmsproc.h"
-# define DPMS_SERVER
-# include <X11/extensions/dpms.h>
+# include <X11/extensions/dpmsconst.h>
 #endif
 
 #define QUEUE_SIZE  512
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 9520957ee..fbe92216f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -156,17 +156,15 @@ typedef void (*InitExtension)(INITARGS);
 #endif
 
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shm.h>
 #endif
 #ifdef XTEST
-#define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
+#include <X11/extensions/xtest.h>
 #endif
 #include <X11/extensions/XKB.h>
 #ifdef XCSECURITY
 #include "securitysrv.h"
-#include <X11/extensions/securstr.h>
+#include <X11/extensions/secur.h>
 #endif
 #ifdef XSELINUX
 #include "xselinux.h"
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index fe768f4a9..996d42476 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -39,8 +39,7 @@ from The Open Group.
 #include "dix.h"
 #include "miline.h"
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include <X11/extensions/shm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to
-- 
cgit v1.2.3