Merged revisions 76623 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76623 | ronald.oussoren | 2009-12-01 16:54:01 +0100 (Tue, 01 Dec 2009) | 9 lines

  Fix for issue #7416: SIZEOF_UINTPTR_T can be invalid when configuring a
  multi-architecture build (in particular when the architectures don't share
  a common pointer size).

  Fixed the same issue for SIZEOF_PTHREAD_T.

  (No update to the NEWS file because this is a bugfix for an as yet unreleased
  feature)
........

diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h
index a452836e3292c81d119e6236ad309b793a1335d6..c4da72205ebeaddbb4aba2658d2cfef61ea2231d 100644 (file)
--- a/Include/pymacconfig.h
+++ b/Include/pymacconfig.h
@@ -16,6 +16,8 @@
 # undef SIZEOF_TIME_T
 # undef SIZEOF_VOID_P
 # undef SIZEOF__BOOL
+# undef SIZEOF_UINTPTR_T
+# undef SIZEOF_PTHREAD_T
 # undef WORDS_BIGENDIAN
 # undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
 # undef DOUBLE_IS_BIG_ENDIAN_IEEE754
@@ -43,6 +45,8 @@
 #        define SIZEOF_SIZE_T          8
 #        define SIZEOF_TIME_T          8
 #        define SIZEOF_VOID_P          8
+#        define SIZEOF_UINTPTR_T       8
+#        define SIZEOF_PTHREAD_T       8
 #    else
 #        ifdef __ppc__
 #          define SIZEOF__BOOL         4
@@ -54,6 +58,8 @@
 #        define SIZEOF_SIZE_T          4
 #        define SIZEOF_TIME_T          4
 #        define SIZEOF_VOID_P          4
+#        define SIZEOF_UINTPTR_T       4
+#        define SIZEOF_PTHREAD_T       4
 #    endif
 
 #    if defined(__LP64__)