joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2025-02-03 18:23:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch from Ryan to fix compiler warnings

Browse Source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401803
This commit is contained in:
Sam Lantinga 2006-05-17 04:01:53 +00:00
parent 15bcc2d457
commit 38fd0dc83a
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/video/x11/SDL_x11dyn.c
View File

@ -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. */