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.
........
This commit is contained in:
Antoine Pitrou 2010-10-10 08:14:41 +00:00
parent 22ad24528e
commit 7be5a65acd
4 changed files with 11 additions and 1 deletions

View file

@ -415,6 +415,7 @@ Randall Kern
Magnus Kessler Magnus Kessler
Lawrence Kesteloot Lawrence Kesteloot
Vivek Khera Vivek Khera
Akira Kitada
Mads Kiilerich Mads Kiilerich
Taek Joo Kim Taek Joo Kim
Paul Kippes Paul Kippes

View file

@ -368,6 +368,9 @@ Tools/Demos
Build 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 #10055: Make json C89-compliant in UCS4 mode.
- Issue #1633863: Don't ignore $CC under AIX. - Issue #1633863: Don't ignore $CC under AIX.

5
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 84683 . # From configure.in Revision: 84948 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 2.7. # 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 ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
#endif #endif
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
" "
if test "x$ac_cv_type_uintptr_t" = x""yes; then : if test "x$ac_cv_type_uintptr_t" = x""yes; then :

View file

@ -1520,6 +1520,9 @@ AC_CHECK_TYPES(uintptr_t,
[AC_CHECK_SIZEOF(uintptr_t, 4)], [AC_CHECK_SIZEOF(uintptr_t, 4)],
[], [#ifdef HAVE_STDINT_H [], [#ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
#endif
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif]) #endif])
AC_CHECK_SIZEOF(off_t, [], [ AC_CHECK_SIZEOF(off_t, [], [