Renamed thread.h to pythread.h.

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f619032ea890468809849b9728f62c7d3b6ed195..e0688721922ce6a941a5e2ffc02b83dac906576d 100644 (file)
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -59,7 +59,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <ctype.h>
 
 #ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #ifdef MS_WINDOWS
@@ -71,6 +71,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "myselect.h"
 #endif
 
+#ifdef PYOS_OS2
+#include "myselect.h"
+#endif
+
 #include <tcl.h>
 #include <tk.h>
 

diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c
index 2f0d05de506969ce6cd3fcace8215bb6d439cc64..ca7fa5f0d6ca9fcbb5ccbc649bb29f90d9112f54 100644 (file)
--- a/Modules/bsddbmodule.c
+++ b/Modules/bsddbmodule.c
@@ -42,7 +42,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #include "Python.h"
 #ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #include <sys/types.h>

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index b632efd1b3731dd7b7a325e03bbf8ce92e0557b5..8795463cefc530f772e1754bc1f840b550a48084 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -93,7 +93,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WITH_THREAD
 #include <sys/types.h> /* For pid_t */
-#include "thread.h"
+#include "pythread.h"
 static long main_thread;
 static pid_t main_pid;
 #endif

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index f9b4fcdd39c6d0344aac050f6f35faaaa7d67e10..e195389041761505da4b26909a5b49740cd082f2 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -87,7 +87,7 @@ Socket methods:
 
 #include "Python.h"
 #if defined(WITH_THREAD) && !defined(HAVE_GETHOSTBYNAME_R) && !defined(MS_WINDOWS)
-#include "thread.h"
+#include "pythread.h"
 #endif
 
 #ifdef HAVE_UNISTD_H

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 27ffdb2c75d6d14c899c06d976088543beec62b6..c24b3ef64d27c70b15c64ca72cb568b8b4021922 100644 (file)
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -85,7 +85,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WITH_THREAD
 
-#include "thread.h"
+#include "pythread.h"
 
 static type_lock StdwinLock; /* Lock held when interpreter not locked */
 

diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 52d2eb2c9cf0447db7c0292374fafa91c20abf98..3f32af2cfec5e58038c01b62e26939d4b01a1c6a 100644 (file)
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -40,7 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #error "Then run `make clean' followed by `make'."
 #endif
 
-#include "thread.h"
+#include "pythread.h"
 
 static PyObject *ThreadError;
 

diff --git a/Python/ceval.c b/Python/ceval.c
index 0178f84498d8c4cb0d46d0e64a26fde6181e35a9..b004c79640f61a8288d3f926f746d804e020174b 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -109,7 +109,7 @@ static long dxp[256];
 #ifdef WITH_THREAD
 
 #include <errno.h>
-#include "thread.h"
+#include "pythread.h"
 
 extern int _PyThread_Started; /* Flag for Py_Exit */
 

diff --git a/Python/import.c b/Python/import.c
index c8bbc29a45efba971d2d62eed5fa22fe42425023..32dc3193918a13237aeb90c1192a32e179a7a991 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -119,7 +119,7 @@ _PyImport_Fini()
 
 #ifdef WITH_THREAD
 
-#include "thread.h"
+#include "pythread.h"
 
 static type_lock import_lock = 0;
 static long import_lock_thread = -1;

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2be073bda0fa782984198fc63473e4a847a563ed..7cff848422b7d6553eeee8cf669289c9403069d4 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1031,7 +1031,7 @@ Py_FatalError(msg)
 /* Clean up and exit */
 
 #ifdef WITH_THREAD
-#include "thread.h"
+#include "pythread.h"
 int _PyThread_Started = 0; /* Set by threadmodule.c and maybe others */
 #endif
 

diff --git a/Python/thread.c b/Python/thread.c
index 9da701dc71f6b164a0e81c04317fe5c2c2d50dac..ff5aefe68b52bb7c12edfddfe0a8a58e549701e3 100644 (file)
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -59,7 +59,7 @@ extern char *getenv();
 #endif
 #endif
 
-#include "thread.h"
+#include "pythread.h"
 
 #ifdef __ksr__
 #define _POSIX_THREADS