summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-06-14 22:54:23 (GMT)
committerGuido van Rossum <guido@python.org>1995-06-14 22:54:23 (GMT)
commit36bc68024f3d717d94719b0c03de15e846a208e6 (patch)
tree972c3060763a0b8aafd5e2f1085e639adc42fd2f
parent4a2698648e955c0b497dc07cd34d6bcf8a89d994 (diff)
downloadcpython-36bc68024f3d717d94719b0c03de15e846a208e6.zip
cpython-36bc68024f3d717d94719b0c03de15e846a208e6.tar.gz
cpython-36bc68024f3d717d94719b0c03de15e846a208e6.tar.bz2
sys/wait.h; NeXT changes (no unistd, utime; getcwd?)
-rw-r--r--Modules/posixmodule.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 9b2c0e0..3d4bdcf 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -41,6 +41,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h> /* For WNOHANG */
+#endif
#include "mytime.h" /* For clock_t on some systems */
@@ -64,11 +67,23 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define HAVE_WAIT 1
#define HAVE_OPENDIR 1
#define HAVE_PIPE 1
+#define HAVE_GETCWD 1
#endif
#ifndef NT
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
+#ifdef NeXT
+/* NeXT's <unistd.h> and <utime.h> aren't worth much */
+#undef HAVE_UNISTD_H
+#undef HAVE_UTIME_H
+/* #undef HAVE_GETCWD */
+#endif
+
+#ifdef HAVE_UNISTD_H
/* XXX These are for SunOS4.1.3 but shouldn't hurt elsewhere */
extern int rename();
extern int pclose();
@@ -94,6 +109,7 @@ extern int symlink PROTO((const char *, const char *));
extern int lstat PROTO((const char *, struct stat *));
#endif /* HAVE_LSTAT */
#endif /* !HAVE_UNISTD_H */
+
#endif /* !NT */
#ifdef HAVE_UTIME_H
@@ -329,6 +345,7 @@ posix_chown(self, args)
}
#endif /* HAVE_CHOWN */
+#ifdef HAVE_GETCWD
static object *
posix_getcwd(self, args)
object *self;
@@ -345,6 +362,7 @@ posix_getcwd(self, args)
return posix_error();
return newstringobject(buf);
}
+#endif
#ifdef HAVE_LINK
static object *
@@ -1370,7 +1388,9 @@ static struct methodlist posix_methods[] = {
#ifdef HAVE_CHOWN
{"chown", posix_chown},
#endif /* HAVE_CHOWN */
+#ifdef HAVE_GETCWD
{"getcwd", posix_getcwd},
+#endif
#ifdef HAVE_LINK
{"link", posix_link},
#endif /* HAVE_LINK */