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
This commit is contained in:
parent
4a251f5883
commit
9309d2a009
|
@ -55,6 +55,7 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include <X11/Xfuncproto.h>
|
#include <X11/Xfuncproto.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
#include "busfault.h"
|
||||||
|
|
||||||
/* Needed for Solaris cross-zone shared memory extension */
|
/* Needed for Solaris cross-zone shared memory extension */
|
||||||
#ifdef HAVE_SHMCTL64
|
#ifdef HAVE_SHMCTL64
|
||||||
|
|
|
@ -56,16 +56,10 @@ typedef struct _ShmFuncs {
|
||||||
void (*PutImage) (XSHM_PUT_IMAGE_ARGS);
|
void (*PutImage) (XSHM_PUT_IMAGE_ARGS);
|
||||||
} ShmFuncs, *ShmFuncsPtr;
|
} ShmFuncs, *ShmFuncsPtr;
|
||||||
|
|
||||||
#include <protocol-versions.h>
|
#if XTRANS_SEND_FDS
|
||||||
|
|
||||||
#if SERVER_SHM_MAJOR_VERSION == 1 && SERVER_SHM_MINOR_VERSION >= 2
|
|
||||||
#define SHM_FD_PASSING 1
|
#define SHM_FD_PASSING 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SHM_FD_PASSING
|
|
||||||
#include "busfault.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct _ShmDesc {
|
typedef struct _ShmDesc {
|
||||||
struct _ShmDesc *next;
|
struct _ShmDesc *next;
|
||||||
int shmid;
|
int shmid;
|
||||||
|
|
|
@ -2,7 +2,6 @@ if XORG
|
||||||
sdk_HEADERS = \
|
sdk_HEADERS = \
|
||||||
XIstubs.h \
|
XIstubs.h \
|
||||||
Xprintf.h \
|
Xprintf.h \
|
||||||
busfault.h \
|
|
||||||
callback.h \
|
callback.h \
|
||||||
client.h \
|
client.h \
|
||||||
closestr.h \
|
closestr.h \
|
||||||
|
@ -69,6 +68,7 @@ endif
|
||||||
AM_CFLAGS = $(DIX_CFLAGS)
|
AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
busfault.h \
|
||||||
dix-config-apple-verbatim.h \
|
dix-config-apple-verbatim.h \
|
||||||
dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
|
dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
|
||||||
protocol-versions.h \
|
protocol-versions.h \
|
||||||
|
|
Loading…
Reference in New Issue