[Python-checkins] cpython (merge 3.3 -> default): Merge 3.3.

Mon Nov 12 20:37:10 CET 2012

http://hg.python.org/cpython/rev/3857a63cf840
changeset: 80407:3857a63cf840
parent: 80404:6a6ad09faad2
parent: 80406:5db6d9ddf6e8
user: Stefan Krah <skrah at bytereef.org>
date: Mon Nov 12 20:24:09 2012 +0100
summary:
 Merge 3.3.
files:
 Include/osdefs.h | 8 ++++++++
 Python/fileutils.c | 1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Include/osdefs.h b/Include/osdefs.h
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -23,6 +23,14 @@
 #endif
 
 /* Max pathname length */
+#ifdef __hpux
+#include <sys/param.h>
+#include <limits.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAXPATHLEN
+#endif
+#endif
+
 #ifndef MAXPATHLEN
 #if defined(PATH_MAX) && PATH_MAX > 1024
 #define MAXPATHLEN PATH_MAX
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "osdefs.h"
 #ifdef MS_WINDOWS
 # include <windows.h>
 #endif
-- 
Repository URL: http://hg.python.org/cpython
