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.
  ........
................

diff --git a/Include/pyport.h b/Include/pyport.h
index 437c818259eddfa466a4de3e0c5acb7b649beae0..be15fe1b6c3b02779ff963398286cbf6ff6a5295 100644 (file)
--- 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 3a4d4860b4fea3778339bfcfee72079dc2b7d3a4..fb1fee720e4072c9dc76d31f87aafd4e47ef01a4 100644 (file)
--- 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.