From 0d21e644096c700d9cf87038e736dd5ae0f738af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sat, 12 Jan 2002 11:13:24 +0000
Subject: Include <unistd.h> in Python.h. Fixes #500924.

---
 Python/bltinmodule.c    | 4 ----
 Python/dynload_beos.c   | 1 -
 Python/frozenmain.c     | 9 ---------
 Python/import.c         | 4 ----
 Python/pythonrun.c      | 4 ----
 Python/sysmodule.c      | 4 ----
 Python/thread.c         | 6 +-----
 Python/thread_solaris.h | 1 -
 8 files changed, 1 insertion(+), 32 deletions(-)

(limited to 'Python')

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index f5ce74975c..c997ecf550 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -9,10 +9,6 @@
 
 #include <ctype.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef RISCOS
 #include "unixstuff.h"
 #endif
diff --git a/Python/dynload_beos.c b/Python/dynload_beos.c
index 5de96c97d0..eec8592820 100644
--- a/Python/dynload_beos.c
+++ b/Python/dynload_beos.c
@@ -4,7 +4,6 @@
 #include <kernel/image.h>
 #include <kernel/OS.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "Python.h"
 #include "importdl.h"
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index efc87d72a3..21724ef324 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -9,15 +9,6 @@ extern void PyWinFreeze_ExeTerm(void);
 extern int PyInitFrozenExtensions(void);
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* For isatty() */
-#endif
-
-/* For isatty()'s proto. - [cjh] */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 /* Main program */
 
 int
diff --git a/Python/import.c b/Python/import.c
index 0b4cd0f7cc..ba7d5d5040 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -15,10 +15,6 @@
 #include "macglue.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4294c9748e..6b70739d0a 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -13,10 +13,6 @@
 #include "eval.h"
 #include "marshal.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index ff49adcece..cdc728c402 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -20,10 +20,6 @@ Data members:
 
 #include "osdefs.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef MS_COREDLL
 extern void *PyWin_DLLhModule;
 /* A string loaded from the DLL at startup: */
diff --git a/Python/thread.c b/Python/thread.c
index df42f316be..f9a4de9cb2 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -5,7 +5,7 @@
    which is included by this file dependent on config settings.
    Stuff shared by all thread_*.h files is collected here. */
 
-#include "pyconfig.h"
+#include "Python.h"
 
 /* pyconfig.h may or may not define DL_IMPORT */
 #ifndef DL_IMPORT	/* declarations for DLL import/export */
@@ -24,10 +24,6 @@ extern char *getenv(const char *);
 #endif
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef __DGUX
 #define _USING_POSIX4A_DRAFT6
 #endif
diff --git a/Python/thread_solaris.h b/Python/thread_solaris.h
index 4c958b915e..8e24126600 100644
--- a/Python/thread_solaris.h
+++ b/Python/thread_solaris.h
@@ -1,7 +1,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <errno.h>
 #include </usr/include/thread.h>
 #undef _POSIX_THREADS
-- 
cgit v1.2.1