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 3a3428c05a9072ac73faba4a3fe930cbf8163071..fcfbf584a4d89b61bce21c33055a5978e4401b44 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
@@ -40,6 +42,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
@@ -51,6 +55,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__)