1*4882a593Smuzhiyunsdl: Fix compilation with libX11 >= 1.5.99.902 2*4882a593SmuzhiyunSigned-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 3*4882a593Smuzhiyun 4*4882a593Smuzhiyun# HG changeset patch 5*4882a593Smuzhiyun# User Azamat H. Hackimov <azamat.hackimov@gmail.com> 6*4882a593Smuzhiyun# Date 1370184533 -21600 7*4882a593Smuzhiyun# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8 8*4882a593Smuzhiyun# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268 9*4882a593SmuzhiyunFix compilation with libX11 >= 1.5.99.902. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunThese changes fixes bug #1769 for SDL 1.2 12*4882a593Smuzhiyun(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff -r f7fd5c3951b9 -r 91ad7b43317a configure.in 15*4882a593Smuzhiyun--- a/configure.in Wed Apr 17 00:56:53 2013 -0700 16*4882a593Smuzhiyun+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600 17*4882a593Smuzhiyun@@ -1169,6 +1169,17 @@ 18*4882a593Smuzhiyun if test x$definitely_enable_video_x11_xrandr = xyes; then 19*4882a593Smuzhiyun AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) 20*4882a593Smuzhiyun fi 21*4882a593Smuzhiyun+ AC_MSG_CHECKING(for const parameter to _XData32) 22*4882a593Smuzhiyun+ have_const_param_xdata32=no 23*4882a593Smuzhiyun+ AC_TRY_COMPILE([ 24*4882a593Smuzhiyun+ #include <X11/Xlibint.h> 25*4882a593Smuzhiyun+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); 26*4882a593Smuzhiyun+ ],[ 27*4882a593Smuzhiyun+ ],[ 28*4882a593Smuzhiyun+ have_const_param_xdata32=yes 29*4882a593Smuzhiyun+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) 30*4882a593Smuzhiyun+ ]) 31*4882a593Smuzhiyun+ AC_MSG_RESULT($have_const_param_xdata32) 32*4882a593Smuzhiyun fi 33*4882a593Smuzhiyun fi 34*4882a593Smuzhiyun } 35*4882a593Smuzhiyundiff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in 36*4882a593Smuzhiyun--- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700 37*4882a593Smuzhiyun+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600 38*4882a593Smuzhiyun@@ -283,6 +283,7 @@ 39*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_WINDIB 40*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_WSCONS 41*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_X11 42*4882a593Smuzhiyun+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 43*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE 44*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_X11_DYNAMIC 45*4882a593Smuzhiyun #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT 46*4882a593Smuzhiyundiff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h 47*4882a593Smuzhiyun--- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700 48*4882a593Smuzhiyun+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600 49*4882a593Smuzhiyun@@ -165,7 +165,11 @@ 50*4882a593Smuzhiyun */ 51*4882a593Smuzhiyun #ifdef LONG64 52*4882a593Smuzhiyun SDL_X11_MODULE(IO_32BIT) 53*4882a593Smuzhiyun+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 54*4882a593Smuzhiyun+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) 55*4882a593Smuzhiyun+#else 56*4882a593Smuzhiyun SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) 57*4882a593Smuzhiyun+#endif 58*4882a593Smuzhiyun SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) 59*4882a593Smuzhiyun #endif 60*4882a593Smuzhiyun 61