summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-06-30 15:45:17 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-06-30 15:45:17 (GMT)
commit835a6c8467a5c2d63a23b392d21c79c5f5a9e300 (patch)
treed41e5f63a89b3e92ced4f5e84bf0bec3b7e831d5
parentaa3b5b857791052e4e22a137f8315992c389f6f4 (diff)
downloadcpython-835a6c8467a5c2d63a23b392d21c79c5f5a9e300.zip
cpython-835a6c8467a5c2d63a23b392d21c79c5f5a9e300.tar.gz
cpython-835a6c8467a5c2d63a23b392d21c79c5f5a9e300.tar.bz2
Merged revisions 73701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73701 | mark.dickinson | 2009-06-30 16:32:30 +0100 (Tue, 30 Jun 2009) | 3 lines Issue #6347: Add inttypes.h to the pyport.h #includes; fixes a build failure on HP-UX 11.00. ........
-rw-r--r--Include/pyport.h6
-rw-r--r--Misc/NEWS4
2 files changed, 10 insertions, 0 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 437c818..be15fe1 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -3,6 +3,12 @@
#include "pyconfig.h" /* include for defines */
+/* Some versions of HP-UX & Solaris need inttypes.h for int32_t,
+ INT32_MAX, etc. */
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
diff --git a/Misc/NEWS b/Misc/NEWS
index 98539e5..9c48b97 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.2 Alpha 1?
Core and Builtins
-----------------
+- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h.
+ This fixes a build failure on HP-UX: int32_t and uint32_t are
+ defined in inttypes.h instead of stdint.h on that platform.
+
- Issue #6373: Fixed a RuntimeError when encoding with the latin-1 codec and
the 'surrogateescape' error handler, a string which contains unpaired
surrogates.