From: Antoine Pitrou Date: Sun, 10 Oct 2010 08:14:41 +0000 (+0000) Subject: Merged revisions 85349 via svnmerge from X-Git-Tag: v2.7.1rc1~183 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7be5a65acd4d155730bd5c7981e16b1e5ab814c0;p=python 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 30464c0d24..275426e485 100644 --- 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 41a8fd897f..1dc3fdf9bf 100644 --- 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 78968e69c3..2e42864083 100755 --- 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 #endif + #ifdef HAVE_INTTYPES_H + #include + #endif " if test "x$ac_cv_type_uintptr_t" = x""yes; then : diff --git a/configure.in b/configure.in index 390781851a..bfa5ba5127 100644 --- 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 + #endif + #ifdef HAVE_INTTYPES_H + #include #endif]) AC_CHECK_SIZEOF(off_t, [], [