From 4c9f1ba041644329543e4ca21c0d95cf872f988e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 14 Nov 2013 08:30:53 +0100
Subject: mesa xserver git update 14 nov 2013

xserver          commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab
mesa             commit a15a19f0d1b024f5f18f1dfe878ae8d399e38469
---
 xorg-server/Xext/shm.c    | 1 +
 xorg-server/Xext/shmint.h | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'xorg-server/Xext')

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;
-- 
cgit v1.2.3