More dynamic X11 work.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 13 Jan 2006 01:08:39 +0000
changeset 1244a388f2b59044
parent 1243 08c730212ca2
child 1245 fe7d081a4955
More dynamic X11 work.
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11sym.h
     1.1 --- a/src/video/x11/SDL_x11dyn.h	Thu Jan 12 23:06:23 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11dyn.h	Fri Jan 13 01:08:39 2006 +0000
     1.3 @@ -72,6 +72,7 @@
     1.4  #define _XReply p_XReply
     1.5  #define _XSend p_XSend
     1.6  #define _XData32 p_XData32
     1.7 +#define XFree pXFree
     1.8  #endif
     1.9  
    1.10  int SDL_X11_LoadSymbols(void);
     2.1 --- a/src/video/x11/SDL_x11sym.h	Thu Jan 12 23:06:23 2006 +0000
     2.2 +++ b/src/video/x11/SDL_x11sym.h	Fri Jan 13 01:08:39 2006 +0000
     2.3 @@ -112,6 +112,8 @@
     2.4  SDL_X11_SYM(1,void,XextDestroyExtension,(XExtensionInfo*))
     2.5  SDL_X11_SYM(1,XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo*,Display*))
     2.6  SDL_X11_SYM(1,int,XextRemoveDisplay,(XExtensionInfo*,Display*))
     2.7 +SDL_X11_SYM(1,Bool,XQueryExtension,(Display*,_Xconst char*,int*,int*,int*))
     2.8 +
     2.9  #ifdef X_HAVE_UTF8_STRING
    2.10  SDL_X11_SYM(1,int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*))
    2.11  SDL_X11_SYM(1,int,Xutf8LookupString,(XIC,XKeyPressedEvent*,char*,int,KeySym*,Status*))
    2.12 @@ -130,8 +132,15 @@
    2.13  SDL_X11_SYM(1,void,_XSend,(Display*,_Xconst char*,long))
    2.14  SDL_X11_SYM(1,Status,_XReply,(Display*,xReply*,int,Bool))
    2.15  SDL_X11_SYM(1,unsigned long,_XSetLastRequestRead,(Display*,xGenericReply*))
    2.16 -SDL_X11_SYM(0,int,_XData32,(Display *dpy,register long *data,unsigned len))
    2.17 -SDL_X11_SYM(0,void,_XRead32,(Display *dpy,register long *data,long len))
    2.18 +
    2.19 +/*
    2.20 + * These don't exist in 32-bit versions and are removed by Xlib macros, but
    2.21 + *  64+ bit systems will use them.
    2.22 + */
    2.23 +#ifdef LONG64
    2.24 +SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
    2.25 +SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
    2.26 +#endif
    2.27  
    2.28  #if NeedWidePrototypes
    2.29  SDL_X11_SYM(1,KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))