From 1bf29b7da72e32db56458952a33772a9773b535a Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Oct 2010 08:10:16 +0000
Subject: [PATCH] Some platforms provide uintptr_t in inttypes.h.  Patch by
 Akira Kitada.

---
 Misc/ACKS    | 1 +
 Misc/NEWS    | 3 +++
 configure    | 5 ++++-
 configure.in | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Misc/ACKS b/Misc/ACKS
index 97792ad1ad4..e8132fb5bfa 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 94f0d8680ff..81dc552e7e7 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 0199ba0d52f..f7d2334e361 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 d9e208e7d7b..80c581b0140 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, [], [