summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-11-12 20:24:09 +0100
committerStefan Krah <skrah@bytereef.org>2012-11-12 20:24:09 +0100
commitabaca8cb0642c041a59d74e2b5775a80efe85240 (patch)
tree0fedd8a3b0000cc740d02d35629b1b93c27683c9
parentf7a8cf24922002e73331ec74a2b1ac83b6f7097d (diff)
parent6df5cae49a6ff61ce523361d30784893e59f3837 (diff)
downloadcpython-git-abaca8cb0642c041a59d74e2b5775a80efe85240.tar.gz
Merge 3.3.
-rw-r--r--Include/osdefs.h8
-rw-r--r--Python/fileutils.c1
2 files changed, 9 insertions, 0 deletions
diff --git a/Include/osdefs.h b/Include/osdefs.h
index ed88da122f..0c2e34b879 100644
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -23,6 +23,14 @@ extern "C" {
#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
index 526751d5ad..2e25aae075 100644
--- 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