summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-05-03 12:14:10 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-05-03 14:03:43 -0700
commitf5403828c68af0f12c79c0504df0a4781ca84b2b (patch)
tree5a12e07df2f30326d2abd7fc42f0bc4bf46b5f0b
parent0cc3162cd29e63f915dc2b66c8dbd7a1a3dcdddc (diff)
glxproto: make GLX swap event struct match specglproto-1.4.13
We only spec a 32 bit swap count, so drop the high sbc field. Also make the padding explicit (most compilers would have already done this since it's not a packed structure, but making it explicit should prevent surprises in the future). Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--configure.ac2
-rw-r--r--glxproto.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d88e6df..a3047e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/glxproto.h b/glxproto.h
index 0ff44e3..dfa0647 100644
--- a/glxproto.h
+++ b/glxproto.h
@@ -1375,13 +1375,13 @@ typedef struct {
BYTE pad;
CARD16 sequenceNumber B16;
CARD16 event_type B16;
+ CARD16 pad2;
CARD32 drawable;
CARD32 ust_hi B32;
CARD32 ust_lo B32;
CARD32 msc_hi B32;
CARD32 msc_lo B32;
- CARD32 sbc_hi B32;
- CARD32 sbc_lo B32;
+ CARD32 sbc B32;
} xGLXBufferSwapComplete;
/************************************************************************/