summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-03-03 23:17:02 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-03-03 23:17:02 (GMT)
commitbc2e10e7b6588d2677e970e390e066e235c56dbd (patch)
tree2a9c0a4822ef600de67d6e9580b5482be3554e37
parent5833baa30942076694b88185ccb02ebe1102c926 (diff)
downloadcpython-bc2e10e7b6588d2677e970e390e066e235c56dbd.zip
cpython-bc2e10e7b6588d2677e970e390e066e235c56dbd.tar.gz
cpython-bc2e10e7b6588d2677e970e390e066e235c56dbd.tar.bz2
Python no longer compiled on Windows, due to #include file confusion
over SEP, ALTSEP and MAXPATHLEN. Patched up posixmodule.c for MSVC, but unsure what the story is now on other non-Unixish platforms -- the preprocessor maze has no exit <wink>.
-rw-r--r--Modules/posixmodule.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 27a93d0..aa9244a 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -193,10 +193,6 @@ extern int lstat(const char *, struct stat *);
#include <sys/utsname.h>
#endif /* HAVE_SYS_UTSNAME_H */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif /* MAXPATHLEN */
-
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#define NAMLEN(dirent) strlen((dirent)->d_name)
@@ -223,6 +219,7 @@ extern int lstat(const char *, struct stat *);
#include <direct.h>
#include <io.h>
#include <process.h>
+#include "osdefs.h"
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#ifdef MS_WIN32
@@ -238,6 +235,10 @@ extern int lstat(const char *, struct stat *);
#include <io.h>
#endif /* OS2 */
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 1024
+#endif /* MAXPATHLEN */
+
#ifdef UNION_WAIT
/* Emulate some macros on systems that have a union instead of macros */