Fix dumb build errors.

I always build with -DGLX_USE_TLS, so I never hit these paths.  glapi.h is
required in some places because _glapi_Dispatch is declared there, but
_glapi_tls_Dispatch is declared in glthread.h.

diff --git a/src/glx/x11/singlepix.c b/src/glx/x11/singlepix.c
index 5eeb4cedab3f05c59aa5de1548f3cdd50e53e8e5..a7b5b798707482341eaa200ebb1516ad5c2aefd9 100644 (file)
--- a/src/glx/x11/singlepix.c
+++ b/src/glx/x11/singlepix.c
@@ -37,6 +37,7 @@
 #include "packsingle.h"
 #include "indirect.h"
 #include "dispatch.h"
+#include "glapi.h"
 #include "glthread.h"
 #include "glapioffsets.h"
 #include <GL/glxproto.h>

diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index be5a7fe6bab93224204624502a546c7848d3a2bb..d1ccc5fba69dff5f7fdc642955dd4fc2f57b25db 100644 (file)
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -433,7 +433,7 @@ get_static_proc_address(const char *funcName)
 #if defined(DISPATCH_FUNCTION_SIZE) && defined(GLX_INDIRECT_RENDERING)
       return (f->Address == NULL)
         ? (_glapi_proc) (gl_dispatch_functions_start
-                         + (DISPATCH_FUNCTION_SIZE * f->Offset));
+                         + (DISPATCH_FUNCTION_SIZE * f->Offset))
          : f->Address;
 #elif defined(DISPATCH_FUNCTION_SIZE)
       return (_glapi_proc) (gl_dispatch_functions_start