From c30fe8fd7cf25f620cf3480416a514172edef0bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 21 May 2008 11:59:23 -0400 Subject: [PATCH] Make the shared glapi files not include glheader.h. --- src/mesa/glapi/glapi.c | 11 ++++++++++- src/mesa/glapi/glthread.c | 4 ++-- src/mesa/glapi/glthread.h | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 36b09e68e50..c4d101aee55 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -51,10 +51,19 @@ #ifdef HAVE_DIX_CONFIG_H + #include -#endif +#define PUBLIC + +#else #include "glheader.h" + +#endif + +#include +#include + #include "glapi.h" #include "glapioffsets.h" #include "glapitable.h" diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c index 92f2e5bf560..813d6f9dbc2 100644 --- a/src/mesa/glapi/glthread.c +++ b/src/mesa/glapi/glthread.c @@ -25,7 +25,7 @@ /* * XXX There's probably some work to do in order to make this file - * truly reusable outside of Mesa. First, the glheader.h include must go. + * truly reusable outside of Mesa. */ @@ -33,7 +33,7 @@ #include #endif -#include "glheader.h" +#include #include "glthread.h" diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index a61086d0dc6..e2765cebb10 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -259,11 +259,11 @@ typedef benaphore _glthread_Mutex; * THREADS not defined */ -typedef GLuint _glthread_TSD; +typedef int _glthread_TSD; -typedef GLuint _glthread_Thread; +typedef int _glthread_Thread; -typedef GLuint _glthread_Mutex; +typedef int _glthread_Mutex; #define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0 -- 2.30.2