From a5fca974cfba4065a6383ff9ea4693b2960c6e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Sun, 2 May 2010 16:10:40 +0100
Subject: [PATCH] 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 93733d5b8cc..b8acb3effec 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -106,6 +106,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"
@@ -141,6 +143,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 e03a5d2e0fc..5dc13c29005 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -35,13 +35,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