Module: Mesa Branch: master Commit: ec91810147425f4123ec80117109925e054cc66d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec91810147425f4123ec80117109925e054cc66d
Author: George Sapountzis <[email protected]> Date: Thu Feb 25 17:52:04 2010 +0200 glapi: minor ugliness to be able to copy to xorg --- src/mesa/glapi/glapi.c | 13 +------------ src/mesa/glapi/glapi_dispatch.c | 6 ++++++ src/mesa/glapi/glapi_getproc.c | 8 ++++++-- src/mesa/glapi/glapi_nop.c | 6 ++++++ src/mesa/glapi/glthread.c | 4 +++- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 469523d..631ffba 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -51,22 +51,11 @@ #ifdef HAVE_DIX_CONFIG_H - #include <dix-config.h> -#define PUBLIC - +#include "glapi/mesa.h" #else - #include "main/glheader.h" - -#endif - #include "main/compiler.h" - -#include <stdlib.h> -#include <string.h> -#ifdef DEBUG -#include <assert.h> #endif #include "glapi/glapi.h" diff --git a/src/mesa/glapi/glapi_dispatch.c b/src/mesa/glapi/glapi_dispatch.c index 4cb43f4..32b9535 100644 --- a/src/mesa/glapi/glapi_dispatch.c +++ b/src/mesa/glapi/glapi_dispatch.c @@ -37,8 +37,14 @@ * \author Brian Paul <[email protected]> */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#include "glapi/mesa.h" +#else #include "main/glheader.h" #include "main/compiler.h" +#endif + #include "glapi/glapi.h" #include "glapi/glapitable.h" #include "glapi/glapidispatch.h" diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c index eecfb9c..69eb42c 100644 --- a/src/mesa/glapi/glapi_getproc.c +++ b/src/mesa/glapi/glapi_getproc.c @@ -30,10 +30,14 @@ */ -#include <stdlib.h> -#include <string.h> +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#include "glapi/mesa.h" +#else #include "main/glheader.h" #include "main/compiler.h" +#endif + #include "glapi/glapi.h" #include "glapi/glapioffsets.h" #include "glapi/glapitable.h" diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c index aa84b9a..b1a718a 100644 --- a/src/mesa/glapi/glapi_nop.c +++ b/src/mesa/glapi/glapi_nop.c @@ -38,8 +38,14 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#include "glapi/mesa.h" +#else #include "main/compiler.h" #include "main/glheader.h" +#endif + #include "glapi/glapi.h" #ifdef DEBUG diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c index 1c2c386..be4e2f7 100644 --- a/src/mesa/glapi/glthread.c +++ b/src/mesa/glapi/glthread.c @@ -30,9 +30,11 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#include "glapi/mesa.h" +#else +#include "main/compiler.h" #endif -#include "main/compiler.h" #include "glapi/glthread.h" _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
