Mesa (master): mesa: #ifdef out more remap_table related code when disabled .

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sun May 2 15:11:11 UTC 2010


Module: Mesa
Branch: master
Commit: 559d124ed3f2070c73c5cb9c3b506ddd9cfaeb02
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=559d124ed3f2070c73c5cb9c3b506ddd9cfaeb02

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun May  2 16:10:40 2010 +0100

mesa: #ifdef out more remap_table related code when disabled.

Seems to get everything building again here.

---

 src/mesa/main/api_exec.c |    4 ++++
 src/mesa/main/remap.c    |    5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 7b6ac63..f838561 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -107,6 +107,8 @@
 #endif
 #include "main/dispatch.h"
 
+#ifdef _GLAPI_USE_REMAP_TABLE
+
 #define need_MESA_remap_table
 #include "main/remap.h"
 #include "main/remap_helper.h"
@@ -142,6 +144,8 @@ _mesa_init_remap_table(void)
 			     MESA_remap_table_functions);
 }
 
+#endif /* _GLAPI_USE_REMAP_TABLE */
+
 
 /**
  * Initialize a dispatch table with pointers to Mesa's immediate-mode
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index 38ddc0c..2b0d054 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -36,13 +36,12 @@
  * a dynamic entry, or the corresponding static entry, in glapi.
  */
 
+#if FEATURE_remap_table
+
 #include "remap.h"
 #include "imports.h"
 #include "glapi/glapi.h"
 
-#if FEATURE_remap_table
-
-
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
 #define MAX_ENTRY_POINTS 16
 




More information about the mesa-commit mailing list