diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:30:53 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:30:53 +0100 |
| commit | 4c9f1ba041644329543e4ca21c0d95cf872f988e (patch) | |
| tree | fd4693e097f87bb138c27448ae610eeed5513eff /xorg-server/Xext | |
| parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
| download | vcxsrv-4c9f1ba041644329543e4ca21c0d95cf872f988e.tar.gz vcxsrv-4c9f1ba041644329543e4ca21c0d95cf872f988e.tar.bz2 vcxsrv-4c9f1ba041644329543e4ca21c0d95cf872f988e.zip | |
mesa xserver git update 14 nov 2013
xserver commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab
mesa commit a15a19f0d1b024f5f18f1dfe878ae8d399e38469
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/shm.c | 1 | ||||
| -rw-r--r-- | xorg-server/Xext/shmint.h | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 46ce521af..d014b9194 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/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/xorg-server/Xext/shmint.h b/xorg-server/Xext/shmint.h index 21d6cc4ee..9dadea756 100644 --- a/xorg-server/Xext/shmint.h +++ b/xorg-server/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; |