glapi: fix assorted warnings

And replace some instances of GLuint with unsigned int to avoid pulling in
GL/gl.h

diff --git a/src/mesa/glapi/glapi_entrypoint.c b/src/mesa/glapi/glapi_entrypoint.c
index c4f43f66a188854d81f234a6b5b086f52c660851..239780e7539ebebfbb6506c80bdbae9f4304bc6a 100644 (file)
--- a/src/mesa/glapi/glapi_entrypoint.c
+++ b/src/mesa/glapi/glapi_entrypoint.c
@@ -56,7 +56,7 @@ extern const GLubyte gl_dispatch_functions_start[];
 #if defined(DISPATCH_FUNCTION_SIZE)
 
 _glapi_proc
-get_entrypoint_address(GLuint functionOffset)
+get_entrypoint_address(unsigned int functionOffset)
 {
    return (_glapi_proc) (gl_dispatch_functions_start
                          + (DISPATCH_FUNCTION_SIZE * functionOffset));
@@ -97,7 +97,7 @@ init_glapi_relocs( void )
  * We need assembly language in order to accomplish this.
  */
 _glapi_proc
-generate_entrypoint(GLuint functionOffset)
+generate_entrypoint(unsigned int functionOffset)
 {
    /* 32 is chosen as something of a magic offset.  For x86, the dispatch
     * at offset 32 is the first one where the offset in the
@@ -122,7 +122,7 @@ generate_entrypoint(GLuint functionOffset)
  * stub that was generated with the preceeding function.
  */
 void
-fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset)
+fill_in_entrypoint_offset(_glapi_proc entrypoint, unsigned int offset)
 {
    GLubyte * const code = (GLubyte *) entrypoint;
 

diff --git a/src/mesa/glapi/glapi_execmem.c b/src/mesa/glapi/glapi_execmem.c
index 6a1fac597f31d7b2db6c9c18774e7e1bf437481f..57f00be8dcc5b0df816c317085e4921884a13833 100644 (file)
--- a/src/mesa/glapi/glapi_execmem.c
+++ b/src/mesa/glapi/glapi_execmem.c
@@ -40,6 +40,7 @@
 #endif
 
 #include "glapi/glthread.h"
+#include "glapi/glapi_priv.h"
 
 
 #if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun)

diff --git a/src/mesa/glapi/glapi_priv.h b/src/mesa/glapi/glapi_priv.h
index 0e2de460f2e8c5532b1000c37ef1c44338bef82b..da6fee63fe7ed994ea09e9220d9e9bebcc8974c6 100644 (file)
--- a/src/mesa/glapi/glapi_priv.h
+++ b/src/mesa/glapi/glapi_priv.h
@@ -27,6 +27,8 @@
 #define _GLAPI_PRIV_H
 
 #include "glthread.h"
+#include "glapi.h"
+
 
 
 /* getproc */
@@ -42,7 +44,7 @@ _glapi_check_table(const struct _glapi_table *table);
 /* execmem */
 
 extern void *
-_glapi_exec_malloc(GLuint size);
+_glapi_exec_malloc(unsigned int size);
 
 
 /* entrypoint */
@@ -52,15 +54,15 @@ init_glapi_relocs_once(void);
 
 
 extern _glapi_proc
-generate_entrypoint(GLuint functionOffset);
+generate_entrypoint(unsigned int functionOffset);
 
 
 extern void
-fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset);
+fill_in_entrypoint_offset(_glapi_proc entrypoint, unsigned int offset);
 
 
 extern _glapi_proc
-get_entrypoint_address(GLuint functionOffset);
+get_entrypoint_address(unsigned int functionOffset);
 
 
 /**