summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-06-30 15:46:37 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-06-30 15:46:37 (GMT)
commit8c1e29488d59e5b3d7a14f3fb28e40427e174a22 (patch)
tree80f84dbef9c58b09d30aeaa1edd0cd142f48abda
parente5344d6c45f15e8cd5b450311a402de568f54b47 (diff)
downloadcpython-8c1e29488d59e5b3d7a14f3fb28e40427e174a22.zip
cpython-8c1e29488d59e5b3d7a14f3fb28e40427e174a22.tar.gz
cpython-8c1e29488d59e5b3d7a14f3fb28e40427e174a22.tar.bz2
Merged revisions 73702 via svnmerge from
svn+ssh://pythondev@www.python.org/python/branches/py3k ................ r73702 | mark.dickinson | 2009-06-30 16:45:17 +0100 (Tue, 30 Jun 2009) | 10 lines 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 3a4d486..fb1fee7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.1.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.