More dynamic X11 fixes...catches some code in Xlib headers that caused
authorRyan C. Gordon <icculus@icculus.org>
Wed, 04 Jan 2006 22:57:50 +0000
changeset 1226d05306f0dc21
parent 1225 09bc22169702
child 1227 3202d727bb4b
More dynamic X11 fixes...catches some code in Xlib headers that caused
dependencies...
src/video/Xext/Xinerama/Xinerama.c
src/video/Xext/Xv/Xv.c
src/video/Xext/Xxf86dga/XF86DGA.c
src/video/Xext/Xxf86dga/XF86DGA2.c
src/video/Xext/Xxf86vm/XF86VMode.c
src/video/x11/SDL_x11dyn.c
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11sym.h
     1.1 --- a/src/video/Xext/Xinerama/Xinerama.c	Wed Jan 04 21:01:49 2006 +0000
     1.2 +++ b/src/video/Xext/Xinerama/Xinerama.c	Wed Jan 04 22:57:50 2006 +0000
     1.3 @@ -37,12 +37,6 @@
     1.4  
     1.5  #include "../../x11/SDL_x11dyn.h"
     1.6  
     1.7 -/* Workaround code in headers... */
     1.8 -#define _XFlush p_XFlush
     1.9 -#define _XFlushGCCache p_XFlushGCCache
    1.10 -#define _XReply p_XReply
    1.11 -#define _XSend p_XSend
    1.12 -
    1.13  static XExtensionInfo _panoramiX_ext_info_data;
    1.14  static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
    1.15  static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
     2.1 --- a/src/video/Xext/Xv/Xv.c	Wed Jan 04 21:01:49 2006 +0000
     2.2 +++ b/src/video/Xext/Xv/Xv.c	Wed Jan 04 22:57:50 2006 +0000
     2.3 @@ -58,12 +58,6 @@
     2.4  
     2.5  #include "../../x11/SDL_x11dyn.h"
     2.6  
     2.7 -/* Workaround code in headers... */
     2.8 -#define _XFlush p_XFlush
     2.9 -#define _XFlushGCCache p_XFlushGCCache
    2.10 -#define _XReply p_XReply
    2.11 -#define _XSend p_XSend
    2.12 -
    2.13  static XExtensionInfo _xv_info_data;
    2.14  static XExtensionInfo *xv_info = &_xv_info_data;
    2.15  static char *xv_extension_name = XvName;
     3.1 --- a/src/video/Xext/Xxf86dga/XF86DGA.c	Wed Jan 04 21:01:49 2006 +0000
     3.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Wed Jan 04 22:57:50 2006 +0000
     3.3 @@ -66,12 +66,6 @@
     3.4  
     3.5  #include "../../x11/SDL_x11dyn.h"
     3.6  
     3.7 -/* Workaround code in headers... */
     3.8 -#define _XFlush p_XFlush
     3.9 -#define _XFlushGCCache p_XFlushGCCache
    3.10 -#define _XReply p_XReply
    3.11 -#define _XSend p_XSend
    3.12 -
    3.13  extern XExtDisplayInfo* SDL_NAME(xdga_find_display)(Display*);
    3.14  extern char *SDL_NAME(xdga_extension_name);
    3.15  
     4.1 --- a/src/video/Xext/Xxf86dga/XF86DGA2.c	Wed Jan 04 21:01:49 2006 +0000
     4.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA2.c	Wed Jan 04 22:57:50 2006 +0000
     4.3 @@ -30,12 +30,6 @@
     4.4  
     4.5  #include "../../x11/SDL_x11dyn.h"
     4.6  
     4.7 -/* Workaround code in headers... */
     4.8 -#define _XFlush p_XFlush
     4.9 -#define _XFlushGCCache p_XFlushGCCache
    4.10 -#define _XReply p_XReply
    4.11 -#define _XSend p_XSend
    4.12 -
    4.13  /* If you change this, change the Bases[] array below as well */
    4.14  #define MAX_HEADS 16
    4.15  
     5.1 --- a/src/video/Xext/Xxf86vm/XF86VMode.c	Wed Jan 04 21:01:49 2006 +0000
     5.2 +++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Wed Jan 04 22:57:50 2006 +0000
     5.3 @@ -49,12 +49,6 @@
     5.4  
     5.5  #include "../../x11/SDL_x11dyn.h"
     5.6  
     5.7 -/* Workaround code in headers... */
     5.8 -#define _XFlush p_XFlush
     5.9 -#define _XFlushGCCache p_XFlushGCCache
    5.10 -#define _XReply p_XReply
    5.11 -#define _XSend p_XSend
    5.12 -
    5.13  #ifdef DEBUG
    5.14  #include <stdio.h>
    5.15  #endif
     6.1 --- a/src/video/x11/SDL_x11dyn.c	Wed Jan 04 21:01:49 2006 +0000
     6.2 +++ b/src/video/x11/SDL_x11dyn.c	Wed Jan 04 22:57:50 2006 +0000
     6.3 @@ -22,6 +22,7 @@
     6.4  
     6.5  /*#define DEBUG_DYNAMIC_X11 1*/
     6.6  
     6.7 +#define __SDL_NO_REDEFINE_X11_HEADER_SYMS 1
     6.8  #include "SDL_x11dyn.h"
     6.9  
    6.10  #ifdef DEBUG_DYNAMIC_X11
     7.1 --- a/src/video/x11/SDL_x11dyn.h	Wed Jan 04 21:01:49 2006 +0000
     7.2 +++ b/src/video/x11/SDL_x11dyn.h	Wed Jan 04 22:57:50 2006 +0000
     7.3 @@ -65,6 +65,15 @@
     7.4  /* Macro in the xlib headers, not an actual symbol... */
     7.5  #define pXDestroyImage XDestroyImage
     7.6  
     7.7 +/* Workaround code in headers... */
     7.8 +#if !__SDL_NO_REDEFINE_X11_HEADER_SYMS
     7.9 +#define _XFlush p_XFlush
    7.10 +#define _XFlushGCCache p_XFlushGCCache
    7.11 +#define _XReply p_XReply
    7.12 +#define _XSend p_XSend
    7.13 +#define _XData32 p_XData32
    7.14 +#endif
    7.15 +
    7.16  int SDL_X11_LoadSymbols(void);
    7.17  void SDL_X11_UnloadSymbols(void);
    7.18  
     8.1 --- a/src/video/x11/SDL_x11sym.h	Wed Jan 04 21:01:49 2006 +0000
     8.2 +++ b/src/video/x11/SDL_x11sym.h	Wed Jan 04 22:57:50 2006 +0000
     8.3 @@ -130,6 +130,8 @@
     8.4  SDL_X11_SYM(void,_XSend,(Display*,_Xconst char*,long))
     8.5  SDL_X11_SYM(Status,_XReply,(Display*,xReply*,int,Bool))
     8.6  SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display*,xGenericReply*))
     8.7 +SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len))
     8.8 +SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len))
     8.9  
    8.10  #if NeedWidePrototypes
    8.11  SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))