From 461651357713b1408400669d6a809f2e367182fe Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 13 Oct 2006 17:34:01 +0000 Subject: [PATCH] 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. --- src/glx/x11/singlepix.c | 1 + src/mesa/glapi/glapi.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glx/x11/singlepix.c b/src/glx/x11/singlepix.c index 5eeb4cedab3..a7b5b798707 100644 --- 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 diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index be5a7fe6bab..d1ccc5fba69 100644 --- 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 -- 2.30.2