diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
| commit | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch) | |
| tree | 91ed73daada51bddd5652fd847f30b3593ecff04 /xorg-server/Xext/shmint.h | |
| parent | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff) | |
| parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
| download | vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2 vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman git update 9 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/Xext/shm.c
Diffstat (limited to 'xorg-server/Xext/shmint.h')
| -rw-r--r-- | xorg-server/Xext/shmint.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/xorg-server/Xext/shmint.h b/xorg-server/Xext/shmint.h index db35fbbbe..21d6cc4ee 100644 --- a/xorg-server/Xext/shmint.h +++ b/xorg-server/Xext/shmint.h @@ -56,16 +56,36 @@ 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 +#define SHM_FD_PASSING 1 +#endif + +#ifdef SHM_FD_PASSING +#include "busfault.h" +#endif + typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; int refcnt; char *addr; - Bool is_fd; Bool writable; unsigned long size; +#ifdef SHM_FD_PASSING + Bool is_fd; + struct busfault *busfault; + XID resource; +#endif } ShmDescRec, *ShmDescPtr; +#ifdef SHM_FD_PASSING +#define SHMDESC_IS_FD(shmdesc) ((shmdesc)->is_fd) +#else +#define SHMDESC_IS_FD(shmdesc) (0) +#endif + extern _X_EXPORT void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); |