Make the shared glapi files not include glheader.h.

This commit is contained in:
Kristian Høgsberg 2008-05-21 11:59:23 -04:00
parent 1b359bc88e
commit c30fe8fd7c
3 changed files with 15 additions and 6 deletions

View file

@ -51,10 +51,19 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#define PUBLIC
#else
#include "glheader.h"
#endif
#include <stdlib.h>
#include <string.h>
#include "glapi.h"
#include "glapioffsets.h"
#include "glapitable.h"

View file

@ -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 <dix-config.h>
#endif
#include "glheader.h"
#include <stdlib.h>
#include "glthread.h"

View file

@ -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