diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-04 15:07:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-04 15:07:35 +0000 |
| commit | 3aa6e4dde5745319ed3051bdb11d107b072282e3 (patch) | |
| tree | 58804e0e423f3720533f542d9fce6c5ab08b653d /gl | |
| parent | e4bd55e182560fa87af77ee3ec49fc1a907ead85 (diff) | |
| parent | 7194f10aa94e3dc9d34eaf8bfa0bdb6c8aa46a38 (diff) | |
| download | vcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.tar.gz vcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.tar.bz2 vcxsrv-3aa6e4dde5745319ed3051bdb11d107b072282e3.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/configure.ac | 26 | ||||
| -rw-r--r-- | gl/glxproto.h | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/gl/configure.ac b/gl/configure.ac index d88e6dff8..d2b574371 100644 --- a/gl/configure.ac +++ b/gl/configure.ac @@ -1,13 +1,13 @@ -AC_PREREQ([2.60]) -AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE - -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) -XORG_DEFAULT_OPTIONS - -AC_OUTPUT([Makefile - glproto.pc]) +AC_PREREQ([2.60])
+AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
+AC_OUTPUT([Makefile
+ glproto.pc])
diff --git a/gl/glxproto.h b/gl/glxproto.h index ee8f2c258..06678c335 100644 --- a/gl/glxproto.h +++ b/gl/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;
/************************************************************************/
|