summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-03-16 18:06:34 +0000
committerBrian Paul <[email protected]>2006-03-16 18:06:34 +0000
commit2b17741e1b7999dacf0974b0a2bcbc10adb26219 (patch)
tree66d6cd6eeca02cf71ecec03b8b31a3582b030ede /src
parentc6c0f947142c0cc82626c238804a68b4e8f53945 (diff)
added #undef GET_DISPATCH
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/x11/glxapi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 69af99730e8..7ce607a69c0 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
- * Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -107,6 +107,9 @@ get_dispatch(Display *dpy)
}
+/* Don't use the GET_DISPATCH defined in glthread.h */
+#undef GET_DISPATCH
+
#define GET_DISPATCH(DPY, TABLE) \
if (DPY == prevDisplay) { \
TABLE = prevTable; \