summaryrefslogtreecommitdiff
path: root/src/glx/x11/single2.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-11-15 16:53:24 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2008-11-15 16:53:24 +0000
commit7468765b18be202a64d58b83f6267b6973ea4897 (patch)
tree6e9fa6dd4a2ff79787bcae247377d07c00a036cf /src/glx/x11/single2.c
parent5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (diff)
parent80d6379722a1249ce13db79a898d340644936f67 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/prog_print.c
Diffstat (limited to 'src/glx/x11/single2.c')
-rw-r--r--src/glx/x11/single2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glx/x11/single2.c b/src/glx/x11/single2.c
index fc9c63a464..b008c6996c 100644
--- a/src/glx/x11/single2.c
+++ b/src/glx/x11/single2.c
@@ -37,6 +37,11 @@
#include "indirect_vertex_array.h"
#include "dispatch.h"
#include "glapi.h"
+#ifdef USE_XCB
+#include <xcb/xcb.h>
+#include <xcb/glx.h>
+#endif /* USE_XCB */
+
/* Used for GL_ARB_transpose_matrix */
static void