summaryrefslogtreecommitdiff
path: root/Include/pymacconfig.h
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-12-01 15:55:14 +0000
committerRonald Oussoren <ronaldoussoren@mac.com>2009-12-01 15:55:14 +0000
commit72e2b6a46da6b318451c4f97fa06b0104da32275 (patch)
tree10fa473c794abcf2a27aa7271fc4fea188d7b9d1 /Include/pymacconfig.h
parent5957710dfbb03a0626889494dbec77b68192aab8 (diff)
downloadcpython-72e2b6a46da6b318451c4f97fa06b0104da32275.tar.gz
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) ........
Diffstat (limited to 'Include/pymacconfig.h')
-rw-r--r--Include/pymacconfig.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h
index a452836e32..c4da72205e 100644
--- 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__)