From 4d74e36f359d22b50302c82a922b79ac24dd3e23 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 14 Jun 2011 08:12:46 +0200 Subject: libxcb mesa xkeyboard-config git update 14 June 2011 --- mesalib/src/mapi/glapi/gen/gl_gentable.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mesalib/src/mapi/glapi/gen') diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py index 0dfebf87f..73986f272 100644 --- a/mesalib/src/mapi/glapi/gen/gl_gentable.py +++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py @@ -42,7 +42,6 @@ header = """ #include "glapi.h" #include "glapitable.h" -#include "main/dispatch.h" struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { @@ -50,7 +49,10 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { char symboln[512]; if(!disp) - return NULL; + return NULL; + + if(symbol_prefix == NULL) + symbol_prefix = ""; """ footer = """ @@ -60,8 +62,9 @@ footer = """ body_template = """ if(!disp->%(name)s) { - snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s", symbol_prefix); - SET_%(name)s(disp, dlsym(handle, symboln)); + snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s", symbol_prefix); + _glapi_proc *procp = (_glapi_proc *)&disp->%(name)s; + *procp = (_glapi_proc) dlsym(handle, symboln); } """ -- cgit v1.2.3