[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3.

Thu Nov 22 23:51:09 CET 2012

http://hg.python.org/cpython/rev/fbca723b5485
changeset: 80560:fbca723b5485
parent: 80558:d9f9abe7821e
parent: 80559:7531dba22872
user: Stefan Krah <skrah at bytereef.org>
date: Thu Nov 22 23:50:25 2012 +0100
summary:
 Merge 3.3.
files:
 configure | 2 ++
 configure.ac | 2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -11620,6 +11620,7 @@
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -14833,6 +14834,7 @@
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
 size_t len = -1;
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3119,6 +3119,7 @@
 AC_MSG_CHECKING(getaddrinfo bug)
 AC_CACHE_VAL(ac_cv_buggy_getaddrinfo,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[[
+#include <stdio.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <string.h>
@@ -4447,6 +4448,7 @@
 AC_MSG_CHECKING(for broken mbstowcs)
 AC_CACHE_VAL(ac_cv_broken_mbstowcs,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
 #include<stdlib.h>
 int main() {
 size_t len = -1;
-- 
Repository URL: http://hg.python.org/cpython
