diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-13 07:01:45 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-11-14 10:22:15 +0900 |
| commit | 9309d2a009a6a3b6090fc377fc7a3eded1a34dc0 (patch) | |
| tree | 25600a1972ad6d84283c058c7f4a5599090c21be | |
| parent | 4a251f5883b042cd902c192060a0be2b11148f2b (diff) | |
xext: Fix shmint.h to not use headers outside of sdk_HEADERS
shmint.h is part of sdk_HEADERS, and so can't use anything not
included in sdk_HEADERS.
busfault.h includes dix-config.h which is not. Leave the use of
struct busfault in shmint.h and move the include of busfault.h to
shm.c.
protocol-versions.h is not part of sdk_HEADERS, so instead of using
that, just use XTRANS_SEND_FDS to choose whether to expose the fd
passing requests directly.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
Reviewed-by: Julien Cristau <jcristau@debian.org>
v2: also avoid using protocol-versions.h
| -rw-r--r-- | Xext/shm.c | 1 | ||||
| -rw-r--r-- | Xext/shmint.h | 8 | ||||
| -rw-r--r-- | include/Makefile.am | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index 46ce521af..d014b9194 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -55,6 +55,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xfuncproto.h> #include <sys/mman.h> #include "protocol-versions.h" +#include "busfault.h" /* Needed for Solaris cross-zone shared memory extension */ #ifdef HAVE_SHMCTL64 diff --git a/Xext/shmint.h b/Xext/shmint.h index 21d6cc4ee..9dadea756 100644 --- a/Xext/shmint.h +++ b/Xext/shmint.h @@ -56,16 +56,10 @@ typedef struct _ShmFuncs { void (*PutImage) (XSHM_PUT_IMAGE_ARGS); } ShmFuncs, *ShmFuncsPtr; -#include <protocol-versions.h> - -#if SERVER_SHM_MAJOR_VERSION == 1 && SERVER_SHM_MINOR_VERSION >= 2 +#if XTRANS_SEND_FDS #define SHM_FD_PASSING 1 #endif -#ifdef SHM_FD_PASSING -#include "busfault.h" -#endif - typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; diff --git a/include/Makefile.am b/include/Makefile.am index 13d91e22c..93d8616f2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,6 @@ if XORG sdk_HEADERS = \ XIstubs.h \ Xprintf.h \ - busfault.h \ callback.h \ client.h \ closestr.h \ @@ -69,6 +68,7 @@ endif AM_CFLAGS = $(DIX_CFLAGS) EXTRA_DIST = \ + busfault.h \ dix-config-apple-verbatim.h \ dixfontstubs.h eventconvert.h eventstr.h inpututils.h \ protocol-versions.h \ |