diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-08-23 16:13:12 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-08-23 18:28:14 +0800 |
| commit | e607b67ebc0d15f6709fc8f9c79afeeda8ac1031 (patch) | |
| tree | bcf25bdb43346c4760eb4b29938ad64c45195bb6 /src/mapi/glapi/glapi_priv.h | |
| parent | 0c878280506767c38887b71b45af2cb64a0f4abd (diff) | |
glapi: Clean up header inclusions.
Do not rely on PUBLIC being defined in glapi.h. Do not include core
mesa headers.
Diffstat (limited to 'src/mapi/glapi/glapi_priv.h')
| -rw-r--r-- | src/mapi/glapi/glapi_priv.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h index 1c2a704211..89f81c723e 100644 --- a/src/mapi/glapi/glapi_priv.h +++ b/src/mapi/glapi/glapi_priv.h @@ -26,9 +26,30 @@ #ifndef _GLAPI_PRIV_H #define _GLAPI_PRIV_H -#include "glthread.h" -#include "glapi.h" +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#include "glapi/mesa.h" +#else /* HAVE_DIX_CONFIG_H */ +#define GL_GLEXT_PROTOTYPES +#include "GL/gl.h" +#include "GL/glext.h" + +#ifndef GL_FIXED +typedef int GLfixed; +typedef int GLclampx; +#endif + +#ifndef GL_OES_EGL_image +typedef void *GLeglImageOES; +#endif + +#endif /* HAVE_DIX_CONFIG_H */ +#include "glapi/glapi.h" /* getproc */ |