[PATCH] xext: Don't include busfault.h in shmint.h

[Keith Packard]

shmint.h is part of sdk_HEADERS, but busfault.h includes dix-config.h
which is not. Leaving the use of struct busfault in shmint.h
and moving the include of busfault.h to shm.c avoids needing to ship
busfault.h as part of the SDK.

Reported-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Keith Packard <keithp at keithp.com>
---
 Xext/shm.c          | 1 +
 Xext/shmint.h       | 4 ----
 include/Makefile.am | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index 46ce521..d014b91 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 21d6cc4..13614ec 100644
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -62,10 +62,6 @@ typedef struct _ShmFuncs {
 #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 13d91e2..93d8616 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 \
-- 
1.8.4.2