summaryrefslogtreecommitdiff
path: root/Xext/shm.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-13 07:01:45 +0900
committerKeith Packard <keithp@keithp.com>2013-11-14 10:22:15 +0900
commit9309d2a009a6a3b6090fc377fc7a3eded1a34dc0 (patch)
tree25600a1972ad6d84283c058c7f4a5599090c21be /Xext/shm.c
parent4a251f5883b042cd902c192060a0be2b11148f2b (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
Diffstat (limited to 'Xext/shm.c')
-rw-r--r--Xext/shm.c1
1 files changed, 1 insertions, 0 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