diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-04-13 19:54:47 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-04-13 19:54:47 +0000 |
| commit | adf90efb468836718a65424c703e4363b17e5e39 (patch) | |
| tree | b3b53765b85ecf464c153af52327a32e126635f3 /xserver/mi | |
| parent | ca12b4fa619e24d52d0feb4dab5d579f82b4b8d7 (diff) | |
Add a configure test for newer proto headers and use it to enable
building xserver 1.6 with those headers. ok oga@.
Diffstat (limited to 'xserver/mi')
| -rw-r--r-- | xserver/mi/mieq.c | 6 | ||||
| -rw-r--r-- | xserver/mi/miinitext.c | 8 | ||||
| -rw-r--r-- | xserver/mi/miscrinit.c | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/xserver/mi/mieq.c b/xserver/mi/mieq.c index 478e68b7e..8090c257c 100644 --- a/xserver/mi/mieq.c +++ b/xserver/mi/mieq.c @@ -56,7 +56,11 @@ in this Software without prior written authorization from The Open Group. #ifdef DPMSExtension # include "dpmsproc.h" # define DPMS_SERVER -# include <X11/extensions/dpms.h> +#ifndef HAVE_X11_EXTENSIONS_DPMSCONST_H +#include <X11/extensions/dpms.h> +#else +#include <X11/extensions/dpmsconst.h> +#endif #endif #define QUEUE_SIZE 512 diff --git a/xserver/mi/miinitext.c b/xserver/mi/miinitext.c index 92d6cd2f0..ca473c0f9 100644 --- a/xserver/mi/miinitext.c +++ b/xserver/mi/miinitext.c @@ -160,13 +160,21 @@ typedef void (*InitExtension)(INITARGS); #endif #ifdef MITSHM +#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_H +#include <X11/extensions/shmproto.h> +#else #define _XSHM_SERVER_ #include <X11/extensions/shmstr.h> #endif +#endif #ifdef XTEST +#ifdef HAVE_X11_EXTENSIONS_XTESTPROTO_H +#include <X11/extensions/xtestproto.h> +#else #define _XTEST_SERVER_ #include <X11/extensions/XTest.h> #endif +#endif #ifdef XKB #include <X11/extensions/XKB.h> #endif diff --git a/xserver/mi/miscrinit.c b/xserver/mi/miscrinit.c index 28d331653..c5a7d82a7 100644 --- a/xserver/mi/miscrinit.c +++ b/xserver/mi/miscrinit.c @@ -39,9 +39,14 @@ from The Open Group. #include "dix.h" #include "miline.h" #ifdef MITSHM +#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_H +#include <X11/extensions/shmproto.h> +#include "shmint.h" +#else #define _XSHM_SERVER_ #include <X11/extensions/XShm.h> #endif +#endif /* We use this structure to propogate some information from miScreenInit to * miCreateScreenResources. miScreenInit allocates the structure, fills it |