From 6b8cced81a75bfe9f4141e0cbd3b8193ab74c310 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 1 Feb 2000 23:57:03 +0000
Subject: patch for XFree86 building

---
 src/mesa/main/dispatch.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index 81f43485c3..09a682593c 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -1,4 +1,4 @@
-/* $Id: dispatch.c,v 1.12 2000/01/31 22:54:41 brianp Exp $ */
+/* $Id: dispatch.c,v 1.13 2000/02/01 23:57:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -80,6 +80,14 @@
  * Generate the GL entrypoint functions here.
  */
 
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+
+/* We're building a DRI driver.
+ * GL entrypoints will be in libGL.so, not in this rendering core.
+ */
+
+#else
+
 #define KEYWORD1
 #define KEYWORD2 GLAPIENTRY
 #if defined(USE_X86_ASM) && !defined(__WIN32__) && !defined(XF86DRI)
@@ -143,6 +151,8 @@ trace(void)
 #include "glapitemp.h"
 
 
+#endif /*GLX_DIRECT_RENDERING*/
+
 
 /**********************************************************************/
 
-- 
cgit v1.2.3