Merged revisions 85349 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85349 | antoine.pitrou | 2010-10-10 10:10:16 +0200 (dim., 10 oct. 2010) | 4 lines

  Some platforms provide uintptr_t in inttypes.h.  Patch by
  Akira Kitada.
........

diff --git a/Misc/ACKS b/Misc/ACKS
index 30464c0d24f4560e8fc4ee18a0a957eaf0073871..275426e4853a61dd7052218cd01a089ea40abf75 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -415,6 +415,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 41a8fd897f4526508ffcfab629a6e42a3cda5274..1dc3fdf9bf202f28d2943fa0aa9f23e31bd36774 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -368,6 +368,9 @@ Tools/Demos
 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 #1633863: Don't ignore $CC under AIX.

diff --git a/configure b/configure
index 78968e69c31909552150ec369b616430e76ee077..2e42864083b4a761fdfb495471ea48e93f7df7ed 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 84683 .
+# From configure.in Revision: 84948 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -7099,6 +7099,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 390781851acd6c7499f7707209a7d3c776eed0be..bfa5ba5127ab2a64130bbcab584c0729169fbedf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1520,6 +1520,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, [], [