From c15835437d23bfa8b6665dafeeb64123df0a1625 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Oct 2010 08:15:08 +0000
Subject: [PATCH] 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.
........
---
 Misc/ACKS    | 1 +
 Misc/NEWS    | 3 +++
 configure    | 7 +++++--
 configure.in | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
index 0c48237f8d7..95dbb9e49a4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -411,6 +411,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 a76b99557c6..3b76452938c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -600,6 +600,9 @@ Extension Modules
 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 #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
diff --git a/configure b/configure
index 4a2f352e9c0..068bb330a1a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 84682 .
+# From configure.in Revision: 85251 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.1.
 #
@@ -7073,6 +7073,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 :
 
@@ -9007,7 +9010,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5
 $as_echo "$with_doc_strings" >&6; }
 
-# Check for Python-specific malloc support
+# Check if eval loop should use timestamp counter profiling
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tsc" >&5
 $as_echo_n "checking for --with-tsc... " >&6; }
 
diff --git a/configure.in b/configure.in
index 6587bee5ba1..2863b8dbef5 100644
--- a/configure.in
+++ b/configure.in
@@ -1472,6 +1472,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])