More dynamic X11 work.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 13 Jan 2006 01:08:39 +0000
changeset 1244 a388f2b59044
parent 1243 08c730212ca2
child 1245 fe7d081a4955
More dynamic X11 work.
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11sym.h
--- a/src/video/x11/SDL_x11dyn.h	Thu Jan 12 23:06:23 2006 +0000
+++ b/src/video/x11/SDL_x11dyn.h	Fri Jan 13 01:08:39 2006 +0000
@@ -72,6 +72,7 @@
 #define _XReply p_XReply
 #define _XSend p_XSend
 #define _XData32 p_XData32
+#define XFree pXFree
 #endif
 
 int SDL_X11_LoadSymbols(void);
--- a/src/video/x11/SDL_x11sym.h	Thu Jan 12 23:06:23 2006 +0000
+++ b/src/video/x11/SDL_x11sym.h	Fri Jan 13 01:08:39 2006 +0000
@@ -112,6 +112,8 @@
 SDL_X11_SYM(1,void,XextDestroyExtension,(XExtensionInfo*))
 SDL_X11_SYM(1,XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo*,Display*))
 SDL_X11_SYM(1,int,XextRemoveDisplay,(XExtensionInfo*,Display*))
+SDL_X11_SYM(1,Bool,XQueryExtension,(Display*,_Xconst char*,int*,int*,int*))
+
 #ifdef X_HAVE_UTF8_STRING
 SDL_X11_SYM(1,int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*))
 SDL_X11_SYM(1,int,Xutf8LookupString,(XIC,XKeyPressedEvent*,char*,int,KeySym*,Status*))
@@ -130,8 +132,15 @@
 SDL_X11_SYM(1,void,_XSend,(Display*,_Xconst char*,long))
 SDL_X11_SYM(1,Status,_XReply,(Display*,xReply*,int,Bool))
 SDL_X11_SYM(1,unsigned long,_XSetLastRequestRead,(Display*,xGenericReply*))
-SDL_X11_SYM(0,int,_XData32,(Display *dpy,register long *data,unsigned len))
-SDL_X11_SYM(0,void,_XRead32,(Display *dpy,register long *data,long len))
+
+/*
+ * These don't exist in 32-bit versions and are removed by Xlib macros, but
+ *  64+ bit systems will use them.
+ */
+#ifdef LONG64
+SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
+SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
+#endif
 
 #if NeedWidePrototypes
 SDL_X11_SYM(1,KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))