Merge pull request #4314 from MartijnKaijser/beta1
[vuplus_xbmc] / tools / depends / target / libsdl / 05-x11-xdata32.patch
1 --- a/configure.in      Wed Apr 17 00:56:53 2013 -0700
2 +++ a/configure.in      Sun Jun 02 20:48:53 2013 +0600
3 @@ -1169,6 +1169,17 @@ 
4              if test x$definitely_enable_video_x11_xrandr = xyes; then
5                  AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
6              fi
7 +            AC_MSG_CHECKING(for const parameter to _XData32)
8 +            have_const_param_xdata32=no
9 +            AC_TRY_COMPILE([
10 +              #include <X11/Xlibint.h>
11 +              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
12 +            ],[
13 +            ],[
14 +            have_const_param_xdata32=yes
15 +            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
16 +            ])
17 +            AC_MSG_RESULT($have_const_param_xdata32)
18          fi
19      fi
20  }
21 --- a/include/SDL_config.h.in   Wed Apr 17 00:56:53 2013 -0700
22 +++ a/include/SDL_config.h.in   Sun Jun 02 20:48:53 2013 +0600
23 @@ -283,6 +283,7 @@ 
24  #undef SDL_VIDEO_DRIVER_WINDIB
25  #undef SDL_VIDEO_DRIVER_WSCONS
26  #undef SDL_VIDEO_DRIVER_X11
27 +#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
28  #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
29  #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
30  #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
31 --- a/src/video/x11/SDL_x11sym.h        Wed Apr 17 00:56:53 2013 -0700
32 +++ a/src/video/x11/SDL_x11sym.h        Sun Jun 02 20:48:53 2013 +0600
33 @@ -165,7 +165,11 @@ 
34   */
35  #ifdef LONG64
36  SDL_X11_MODULE(IO_32BIT)
37 +#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
38 +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
39 +#else
40  SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
41 +#endif
42  SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
43  #endif