aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
committermarha <marha@users.sourceforge.net>2012-10-10 13:31:35 +0200
commitac799961eb382e48c68ffda1e1a89b346eb97f81 (patch)
tree96ab9494b7313d30b9b3d37480937fa07136b27b /mesalib/src/mapi
parente957ce706e896f5ed802d81f26a2663578f8153f (diff)
parent8c5587d9be904856f7e449a144c2819a8e310599 (diff)
downloadvcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.gz
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.tar.bz2
vcxsrv-ac799961eb382e48c68ffda1e1a89b346eb97f81.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 10 oct 2012
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/glX_proto_send.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index 0e4b420fd..2cb0cf4ef 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -169,11 +169,9 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
print '#include "glapi.h"'
print '#include "glthread.h"'
print '#include <GL/glxproto.h>'
- print '#ifdef USE_XCB'
print '#include <X11/Xlib-xcb.h>'
print '#include <xcb/xcb.h>'
print '#include <xcb/glx.h>'
- print '#endif /* USE_XCB */'
print ''
print '#define __GLX_PAD(n) (((n) + 3) & ~3)'