diff options
| author | George Sapountzis <[email protected]> | 2010-02-25 17:52:04 +0200 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2010-02-25 17:52:04 +0200 |
| commit | ec91810147425f4123ec80117109925e054cc66d (patch) | |
| tree | 159ef1edbee94d52986b15528b1b50899cbbab9e | |
| parent | 8ae701cbc9fc8d2e0e710aea7ef3b0fa68dcec73 (diff) | |
glapi: minor ugliness to be able to copy to xorg
| -rw-r--r-- | src/mesa/glapi/glapi.c | 13 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_dispatch.c | 6 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_getproc.c | 8 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_nop.c | 6 | ||||
| -rw-r--r-- | 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 469523d57cf..631ffba3c7f 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 4cb43f45055..32b9535e3fc 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 eecfb9c1ae1..69eb42c79ed 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 aa84b9a169e..b1a718a5f0a 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 1c2c3865716..be4e2f754d7 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" |