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/Xext/shm.c | |
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/Xext/shm.c')
-rw-r--r-- | xserver/Xext/shm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xserver/Xext/shm.c b/xserver/Xext/shm.c index a48d2bd5b..e4962faf6 100644 --- a/xserver/Xext/shm.c +++ b/xserver/Xext/shm.c @@ -54,8 +54,12 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "shmint.h" #include "xace.h" +#ifdef HAVE_X11_EXTENSIONS_SHMPROTO_H +#include <X11/extensions/shmproto.h> +#else #define _XSHM_SERVER_ #include <X11/extensions/shmstr.h> +#endif #include <X11/Xfuncproto.h> /* Needed for Solaris cross-zone shared memory extension */ |