From eafba23b34be31c141ddafb8380520ac9a0622ac Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 21 Nov 2013 22:45:18 -0800 Subject: [PATCH] miext/sync: Handle libxshmfence API change libxshmfence had an unfortunate 'int32_t' type for the mapped fence. That changed to exposing a 'struct shmfence' instead, which is nice and opaque and offers fine type checking across the API. This patch requires the newer version of the library and uses the new interface type. Signed-off-by: Keith Packard Reviewed-by: Julien Cristau --- configure.ac | 2 +- miext/sync/misyncshm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f6ecdc6fe1..5a36e54408 100644 --- a/configure.ac +++ b/configure.ac @@ -787,7 +787,7 @@ DMXPROTO="dmxproto >= 2.2.99.1" VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" WINDOWSWMPROTO="windowswmproto" APPLEWMPROTO="applewmproto >= 1.4" -XSHMFENCE="xshmfence" +XSHMFENCE="xshmfence >= 1.1" dnl Required modules XPROTO="xproto >= 7.0.22" diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c index 20780fde88..01f82fc001 100644 --- a/miext/sync/misyncshm.c +++ b/miext/sync/misyncshm.c @@ -38,7 +38,7 @@ static DevPrivateKeyRec syncShmFencePrivateKey; typedef struct _SyncShmFencePrivate { - int32_t *fence; + struct xshmfence *fence; int fd; } SyncShmFencePrivateRec, *SyncShmFencePrivatePtr;