summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-16 21:39:43 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-16 21:39:43 (GMT)
commitdb3d6cbce00172e44a404fcb9570d011b4b70049 (patch)
tree89b60a58f3a6c93f443331f4b7c6cb5c5d70d3c4
parenteee1fc51ba1b4d184a8176c20d1d3a68bf837c97 (diff)
downloadcpython-db3d6cbce00172e44a404fcb9570d011b4b70049.zip
cpython-db3d6cbce00172e44a404fcb9570d011b4b70049.tar.gz
cpython-db3d6cbce00172e44a404fcb9570d011b4b70049.tar.bz2
Fixed #1638: %zd configure test fails on Linux
-rw-r--r--Misc/NEWS2
-rwxr-xr-xconfigure10
-rw-r--r--configure.in10
3 files changed, 16 insertions, 6 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3c95ca5..a45ac11 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins
-----------------
+- 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.
diff --git a/configure b/configure
index 4aa1730..f31069e 100755
--- a/configure
+++ b/configure
@@ -23176,9 +23176,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;
@@ -23188,6 +23188,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 4964954..799499b 100644
--- a/configure.in
+++ b/configure.in
@@ -3459,9 +3459,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;
@@ -3471,6 +3471,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;