commit abaca8cb0642c041a59d74e2b5775a80efe85240
author Stefan Krah <skrah@bytereef.org> Mon Nov 12 20:24:09 2012 +0100
committer Stefan Krah <skrah@bytereef.org> Mon Nov 12 20:24:09 2012 +0100
tree 0fedd8a3b0000cc740d02d35629b1b93c27683c9
parent f7a8cf24922002e73331ec74a2b1ac83b6f7097d
parent 6df5cae49a6ff61ce523361d30784893e59f3837

Merge 3.3.

Include/osdefs.h

diff --git a/Include/osdefs.h b/Include/osdefs.h
index ed88da1..0c2e34b 100644
--- 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

Python/fileutils.c

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 526751d..2e25aae 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