src/video/x11/SDL_x11dyn.c
changeset 1361 19418e4422cb
parent 1245 fe7d081a4955
child 1402 d910939febfa
     1.1 --- a/src/video/x11/SDL_x11dyn.c	Fri Feb 10 07:29:08 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11dyn.c	Thu Feb 16 10:11:48 2006 +0000
     1.3 @@ -24,6 +24,8 @@
     1.4  #define DEBUG_DYNAMIC_X11 1
     1.5  #endif
     1.6  
     1.7 +#include "SDL_config.h"
     1.8 +
     1.9  #define __SDL_NO_REDEFINE_X11_HEADER_SYMS 1
    1.10  #include "SDL_x11dyn.h"
    1.11  
    1.12 @@ -31,13 +33,13 @@
    1.13  #include <stdio.h>
    1.14  #endif
    1.15  
    1.16 -#ifdef X11_DYNAMIC
    1.17 +#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
    1.18  #include <dlfcn.h>
    1.19  #include "SDL_name.h"
    1.20  #include "SDL_loadso.h"
    1.21 -static const char *x11_library = X11_DYNAMIC;
    1.22 +static const char *x11_library = SDL_VIDEO_DRIVER_X11_DYNAMIC;
    1.23  static void *x11_handle = NULL;
    1.24 -static const char *x11ext_library = X11EXT_DYNAMIC;
    1.25 +static const char *x11ext_library = SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT;
    1.26  static void *x11ext_handle = NULL;
    1.27  
    1.28  static void *X11_GetSym(int required, const char *fnname, int *rc)
    1.29 @@ -65,7 +67,7 @@
    1.30  
    1.31  	return fn;
    1.32  }
    1.33 -#endif  /* defined X11_DYNAMIC */
    1.34 +#endif  /* SDL_VIDEO_DRIVER_X11_DYNAMIC */
    1.35  
    1.36  /* Define all the function pointers... */
    1.37  #define SDL_X11_SYM(req,ret,fn,params) ret (*p##fn) params = NULL;
    1.38 @@ -84,7 +86,7 @@
    1.39  			#include "SDL_x11sym.h"
    1.40  			#undef SDL_X11_SYM
    1.41  
    1.42 -			#ifdef X11_DYNAMIC
    1.43 +			#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
    1.44  			if (x11_handle != NULL) {
    1.45  				SDL_UnloadObject(x11_handle);
    1.46  				x11_handle = NULL;
    1.47 @@ -105,7 +107,7 @@
    1.48  
    1.49      /* deal with multiple modules (dga, x11, etc) needing these symbols... */
    1.50  	if (x11_load_refcount++ == 0) {
    1.51 -		#ifdef X11_DYNAMIC
    1.52 +		#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
    1.53  			x11_handle = SDL_LoadObject(x11_library);
    1.54  			x11ext_handle = SDL_LoadObject(x11ext_library);
    1.55  			rc = ((x11_handle != NULL) && (x11ext_handle != NULL));