# HG changeset patch
# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
# Date 1370413935 -21600
# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458
# Parent  2a858d938e21eb4f6f4496f29557a1fa14b566b4
Make _XData32 checking universal for 32 and 64 architectures.
_XData32 is used only for 64, so there should be no regression in 32bit
enviroment.
This commit intended for making universal SDL_config.h in mixed 32/64
enviroment.

diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake
--- a/cmake/sdlchecks.cmake	Wed Jun 05 12:28:53 2013 +0600
+++ b/cmake/sdlchecks.cmake	Wed Jun 05 12:32:15 2013 +0600
@@ -357,6 +357,7 @@
       endif(HAVE_XGENERICEVENT)
 
       check_c_source_compiles("
+          #define LONG64
           #include <X11/Xlibint.h>
           extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
           int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
diff -r 2a858d938e21 -r 00d5ada80b60 configure.in
--- a/configure.in	Wed Jun 05 12:28:53 2013 +0600
+++ b/configure.in	Wed Jun 05 12:32:15 2013 +0600
@@ -1147,14 +1147,15 @@
             AC_MSG_CHECKING(for const parameter to _XData32)
 	    have_const_param_xdata32=no
 	    AC_TRY_COMPILE([
-	      #include <X11/Xlibint.h>
-	      extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-	    ],[
-	    ],[
-	    have_const_param_xdata32=yes
-	    AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
-	    ])
-	    AC_MSG_RESULT($have_const_param_xdata32)
+              #define LONG64
+              #include <X11/Xlibint.h>
+              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+            ],[
+            ],[
+            have_const_param_xdata32=yes
+            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
+            ])
+            AC_MSG_RESULT($have_const_param_xdata32)
 
             dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
             AC_MSG_CHECKING([for XGenericEvent])
# HG changeset patch
# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
# Date 1370413733 -21600
# Node ID 2a858d938e21eb4f6f4496f29557a1fa14b566b4
# Parent  963d2ba35cfea9d97c98fd78eb937620b3ccdd05
Define universal answer of SIZEOF_VOIDP for 32/64-bit architectures.
This commit makes SDL_config.h universal, so it can be used with mixed
32 and 64 enviroment simultaneously.

diff -r 963d2ba35cfe -r 2a858d938e21 include/SDL_config.h.cmake
--- a/include/SDL_config.h.cmake	Tue Jun 04 14:54:49 2013 -0700
+++ b/include/SDL_config.h.cmake	Wed Jun 05 12:28:53 2013 +0600
@@ -37,7 +37,13 @@
 #cmakedefine volatile @HAVE_VOLATILE@
 
 /* C datatypes */
-#cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
+/* Define SIZEOF_VOIDP for 64/32 architectures */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
 #cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@
 #cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@
 #cmakedefine HAVE_PTHREAD_SPINLOCK @HAVE_PTHREAD_SPINLOCK@
diff -r 963d2ba35cfe -r 2a858d938e21 include/SDL_config.h.in
--- a/include/SDL_config.h.in	Tue Jun 04 14:54:49 2013 -0700
+++ b/include/SDL_config.h.in	Wed Jun 05 12:28:53 2013 +0600
@@ -43,6 +43,11 @@
 
 /* C datatypes */
 #undef SIZEOF_VOIDP
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
 #undef HAVE_GCC_ATOMICS
 #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET
 #undef HAVE_PTHREAD_SPINLOCK