From: José Fonseca Date: Sun, 2 May 2010 15:10:40 +0000 (+0100) Subject: mesa: #ifdef out more remap_table related code when disabled. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=559d124ed3f2070c73c5cb9c3b506ddd9cfaeb02;p=mesa.git mesa: #ifdef out more remap_table related code when disabled. Seems to get everything building again here. --- diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 7b6ac63fac4..f838561aef3 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 38ddc0c1dd7..2b0d054bf29 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