aboutsummaryrefslogtreecommitdiff
path: root/gl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-06 06:13:52 +0000
committermarha <marha@users.sourceforge.net>2011-05-06 06:13:52 +0000
commitc721bc9b176ec37d8b80a92c89840658f8f6c458 (patch)
treedc287f9829cd40b0a7e6643c120315224572b0fd /gl
parent4ac3e6a0be77b6fd4642a3c4df67590cb645ee7e (diff)
parent151019725213fc50a8aa4db8c4524387fea8f476 (diff)
downloadvcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.tar.gz
vcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.tar.bz2
vcxsrv-c721bc9b176ec37d8b80a92c89840658f8f6c458.zip
svn merge ^/branches/released .
Diffstat (limited to 'gl')
-rw-r--r--gl/glxproto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gl/glxproto.h b/gl/glxproto.h
index 06678c335..ee8f2c258 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 B32;
+ CARD32 sbc_hi B32;
+ CARD32 sbc_lo B32;
} xGLXBufferSwapComplete;
/************************************************************************/