From 79ad24c33bd359a548069aa1e1790e00505de2d1 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 17 May 2006 04:01:53 +0000 Subject: [PATCH] Patch from Ryan to fix compiler warnings --- src/video/x11/SDL_x11dyn.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c index 3c646cf94..57e4890e0 100644 --- a/src/video/x11/SDL_x11dyn.c +++ b/src/video/x11/SDL_x11dyn.c @@ -61,30 +61,27 @@ static x11dynlib x11libs[] = { NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR }, }; -static void *X11_GetSym(const char *fnname, int *rc) +static void X11_GetSym(const char *fnname, int *rc, void **fn) { int i; - void *fn = NULL; for (i = 0; i < SDL_TABLESIZE(x11libs); i++) { if (x11libs[i].lib != NULL) { - fn = SDL_LoadFunction(x11libs[i].lib, fnname); - if (fn != NULL) + *fn = SDL_LoadFunction(x11libs[i].lib, fnname); + if (*fn != NULL) break; } } #if DEBUG_DYNAMIC_X11 - if (fn != NULL) - printf("X11: Found '%s' in %s (%p)\n", fnname, x11libs[i].libname, fn); + if (*fn != NULL) + printf("X11: Found '%s' in %s (%p)\n", fnname, x11libs[i].libname, *fn); else printf("X11: Symbol '%s' NOT FOUND!\n", fnname); #endif - if (fn == NULL) + if (*fn == NULL) *rc = 0; /* kill this module. */ - - return fn; } @@ -159,13 +156,13 @@ int SDL_X11_LoadSymbols(void) } } #define SDL_X11_MODULE(modname) thismod = &SDL_X11_HAVE_##modname; - #define SDL_X11_SYM(a,fn,x,y,z) p##fn = X11_GetSym(#fn,thismod); + #define SDL_X11_SYM(a,fn,x,y,z) X11_GetSym(#fn,thismod,(void**)&p##fn); #include "SDL_x11sym.h" #undef SDL_X11_MODULE #undef SDL_X11_SYM #ifdef X_HAVE_UTF8_STRING - pXCreateIC = X11_GetSym("XCreateIC",&SDL_X11_HAVE_UTF8); + X11_GetSym("XCreateIC",&SDL_X11_HAVE_UTF8,(void **)&pXCreateIC); #endif if (!SDL_X11_HAVE_BASEXLIB) { /* some required symbol didn't load. */