From c7ab5994ee86dc689c79df76051cf82c8b266e4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 11 Feb 2010 17:04:06 -0500 Subject: [PATCH] glapi: Avoid #including gl.h It's only used for a couple of integer types and and might conflict with other client API header files. --- src/mesa/glapi/glapi.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h index 47ea23e92b5..f802a61d3bd 100644 --- a/src/mesa/glapi/glapi.h +++ b/src/mesa/glapi/glapi.h @@ -46,8 +46,6 @@ #define GL_GLEXT_PROTOTYPES -#include "GL/gl.h" -#include "GL/glext.h" #include "glthread.h" @@ -136,7 +134,7 @@ struct _glapi_table * _glapi_get_override_dispatch(int layer); -extern GLuint +extern unsigned int _glapi_get_dispatch_table_size(void); @@ -148,7 +146,7 @@ extern int _glapi_add_dispatch( const char * const * function_names, const char * parameter_signature ); -extern GLint +extern int _glapi_get_proc_offset(const char *funcName); @@ -157,7 +155,7 @@ _glapi_get_proc_address(const char *funcName); extern const char * -_glapi_get_proc_name(GLuint offset); +_glapi_get_proc_name(unsigned int offset); #endif -- 2.30.2