summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-10 08:10:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-10 08:10:16 (GMT)
commit1bf29b7da72e32db56458952a33772a9773b535a (patch)
tree2814f367736ae0dff20ac1b163103a42f5a741cf
parent79941b5c09a55c5d1dc620d74e26103e93b1c465 (diff)
downloadcpython-1bf29b7da72e32db56458952a33772a9773b535a.zip
cpython-1bf29b7da72e32db56458952a33772a9773b535a.tar.gz
cpython-1bf29b7da72e32db56458952a33772a9773b535a.tar.bz2
Some platforms provide uintptr_t in inttypes.h. Patch by
Akira Kitada.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rwxr-xr-xconfigure5
-rw-r--r--configure.in3
4 files changed, 11 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 97792ad..e8132fb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -435,6 +435,7 @@ Randall Kern
Magnus Kessler
Lawrence Kesteloot
Vivek Khera
+Akira Kitada
Mads Kiilerich
Taek Joo Kim
Paul Kippes
diff --git a/Misc/NEWS b/Misc/NEWS
index 94f0d86..81dc552 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -346,6 +346,9 @@ Tests
Build
-----
+- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by
+ Akira Kitada.
+
- Issue #10055: Make json C89-compliant in UCS4 mode.
- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
diff --git a/configure b/configure
index 0199ba0..f7d2334 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 84752 .
+# From configure.in Revision: 84946 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.2.
#
@@ -7113,6 +7113,9 @@ fi
ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
"
if test "x$ac_cv_type_uintptr_t" = x""yes; then :
diff --git a/configure.in b/configure.in
index d9e208e..80c581b 100644
--- a/configure.in
+++ b/configure.in
@@ -1483,6 +1483,9 @@ AC_CHECK_TYPES(uintptr_t,
[AC_CHECK_SIZEOF(uintptr_t, 4)],
[], [#ifdef HAVE_STDINT_H
#include <stdint.h>
+ #endif
+ #ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
#endif])
AC_CHECK_SIZEOF(off_t, [], [