[Python-checkins] r85351 - in python/branches/release31-maint: Misc/ACKS Misc/NEWS configure configure.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Oct 10 10:15:08 2010
New Revision: 85351

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/ACKS
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in

Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS	(original)
+++ python/branches/release31-maint/Misc/ACKS	Sun Oct 10 10:15:08 2010
@@ -411,6 +411,7 @@
 Magnus Kessler
 Lawrence Kesteloot
 Vivek Khera
+Akira Kitada
 Mads Kiilerich
 Taek Joo Kim
 Paul Kippes

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Oct 10 10:15:08 2010
@@ -600,6 +600,9 @@
 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.

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Sun Oct 10 10:15:08 2010
@@ -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 @@
 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 @@
 { $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; }
 

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Sun Oct 10 10:15:08 2010
@@ -1472,6 +1472,9 @@
    [AC_CHECK_SIZEOF(uintptr_t, 4)], 
    [], [#ifdef HAVE_STDINT_H
         #include <stdint.h>
+        #endif
+        #ifdef HAVE_INTTYPES_H
+        #include <inttypes.h>
         #endif])