diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-21 22:45:18 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-02 12:57:11 -0800 |
| commit | eafba23b34be31c141ddafb8380520ac9a0622ac (patch) | |
| tree | 60b00db3df09cf1abca198df02cd39863cb57a47 | |
| parent | b6d7ed4d787a652e8150532f384bfdf51760f3c2 (diff) | |
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 <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | miext/sync/misyncshm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f6ecdc6fe..5a36e5440 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 20780fde8..01f82fc00 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; |