From: Christian Heimes <christian@cheimes.de>
Date: Tue, 18 Dec 2007 21:14:54 +0000 (+0000)
Subject: Backport of #1638: %zd configure test fails on Linux
X-Git-Tag: v2.5.2c1~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60d96cd54cc0b3f38275a5ddb93ad868526719a4;p=thirdparty%2FPython%2Fcpython.git

Backport of #1638: %zd configure test fails on Linux
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0b24d7f991bd..b041818e496a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,21 @@ Core and builtins
 -----------------
 
 - Issue #1553: An errornous __length_hint__ can make list() raise a 
+
+- Issue #1638: %zd configure test fails on Linux
+
+- Issue #1620: New property decorator syntax was modifying the decorator
+  in place instead of creating a new decorator object.
+
+- Issue #1580: New free format floating point representation based on
+  "Floating-Point Printer Sample Code", by Robert G. Burger. For example
+  repr(11./5) now returns '2.2' instead of '2.2000000000000002'.
+
+- Issue #1538: Avoid copying string in split/rsplit if the split
+  char is not found.
+
+- Issue #1553: An erroneous __length_hint__ can make list() raise a
+>>>>>>> .merge-rechts.r59533
   SystemError.
 
 - Issue #1521: On 64bit platforms, using PyArgs_ParseTuple with the t# of w#
diff --git a/configure b/configure
index 88e2b9dea2e0..aa63cf708b48 100755
--- a/configure
+++ b/configure
@@ -22505,9 +22505,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 #include <string.h>
 
-int main()
-{
-    char buffer[256];
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #ifdef HAVE_SSIZE_T
 typedef ssize_t Py_ssize_t;
@@ -22517,6 +22517,10 @@ typedef long Py_ssize_t;
 typedef int Py_ssize_t;
 #endif
 
+int main()
+{
+    char buffer[256];
+
     if(sprintf(buffer, "%zd", (size_t)123) < 0)
        	return 1;
 
diff --git a/configure.in b/configure.in
index 24275a11842a..8d19736db2cb 100644
--- a/configure.in
+++ b/configure.in
@@ -3411,9 +3411,9 @@ AC_TRY_RUN([#include <stdio.h>
 #include <stddef.h>
 #include <string.h>
 
-int main()
-{
-    char buffer[256];
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #ifdef HAVE_SSIZE_T
 typedef ssize_t Py_ssize_t;
@@ -3423,6 +3423,10 @@ typedef long Py_ssize_t;
 typedef int Py_ssize_t;
 #endif
 
+int main()
+{
+    char buffer[256];
+
     if(sprintf(buffer, "%zd", (size_t)123) < 0)
        	return 1;