From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 16 Mar 2006 18:06:34 +0000 (+0000)
Subject: added #undef GET_DISPATCH
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b17741e1b7999dacf0974b0a2bcbc10adb26219;p=mesa.git

added #undef GET_DISPATCH
---

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;		\