Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875.
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 84a5bb5..035a11d 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -679,7 +679,7 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\threadmodule.c
+SOURCE=..\..\Modules\_threadmodule.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 38982f4..8692e7a 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -768,7 +768,7 @@
RelativePath="..\..\Python\thread.c">
</File>
<File
- RelativePath="..\..\Modules\threadmodule.c">
+ RelativePath="..\..\Modules\_threadmodule.c">
</File>
<File
RelativePath="..\..\Modules\timemodule.c">
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 75414ce..c2eb356 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1127,7 +1127,7 @@
>
</File>
<File
- RelativePath="..\..\Modules\threadmodule.c"
+ RelativePath="..\..\Modules\_threadmodule.c"
>
</File>
<File
diff --git a/PC/config.c b/PC/config.c
index 1522533..23dbc645 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -22,7 +22,7 @@
extern void init_sha256(void);
extern void init_sha512(void);
extern void inittime(void);
-extern void initthread(void);
+extern void init_thread(void);
extern void initcStringIO(void);
#ifdef WIN32
extern void initmsvcrt(void);
@@ -93,7 +93,7 @@
{"_sha512", init_sha512},
{"time", inittime},
#ifdef WITH_THREAD
- {"thread", initthread},
+ {"_thread", init_thread},
#endif
{"cStringIO", initcStringIO},
#ifdef WIN32
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 2fcb334..5f4cab8 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -281,7 +281,7 @@
Modules/gcmodule.c \
Modules/signalmodule.c \
Modules/posixmodule.c \
- Modules/threadmodule.c \
+ Modules/_threadmodule.c \
Modules/arraymodule.c \
Modules/binascii.c \
Modules/cmathmodule.c \
diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index 47378fd..93fbecc 100644
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -39,7 +39,7 @@
extern void initos2();
extern void initsignal();
#ifdef WITH_THREAD
-extern void initthread();
+extern void init_thread();
#endif
extern void init_codecs();
extern void init_csv();
@@ -99,7 +99,7 @@
{"os2", initos2},
{"signal", initsignal},
#ifdef WITH_THREAD
- {"thread", initthread},
+ {"_thread", init_thread},
#endif
{"_codecs", init_codecs},
{"_csv", init_csv},
diff --git a/PC/os2emx/python26.def b/PC/os2emx/python26.def
index 2795050..8bc91c8 100644
--- a/PC/os2emx/python26.def
+++ b/PC/os2emx/python26.def
@@ -1194,8 +1194,8 @@
; From python26_s.lib(posixmodule)
; "initos2"
-; From python26_s.lib(threadmodule)
-; "initthread"
+; From python26_s.lib(_threadmodule)
+; "init_thread"
; From python26_s.lib(arraymodule)
; "initarray"
diff --git a/PC/os2vacpp/config.c b/PC/os2vacpp/config.c
index 7be2b0b..aba6e79 100644
--- a/PC/os2vacpp/config.c
+++ b/PC/os2vacpp/config.c
@@ -33,7 +33,7 @@
extern void init_socket(void);
extern void initstruct(void);
extern void inittime(void);
-extern void initthread(void);
+extern void init_thread(void);
extern void initcStringIO(void);
extern void initpcre(void);
#ifdef WIN32
@@ -76,7 +76,7 @@
{"struct", initstruct},
{"time", inittime},
#ifdef WITH_THREAD
- {"thread", initthread},
+ {"_thread", init_thread},
#endif
{"cStringIO", initcStringIO},
{"pcre", initpcre},
diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index 93cae73..50119a0 100644
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -868,7 +868,7 @@
$(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
$(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
-threadmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
+_threadmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \
$(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \
pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \
$(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \
diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index 2e0aae3..a925efb 100644
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -630,7 +630,7 @@
pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
traceback.h tupleobject.h
-threadmodule.obj: abstract.h ceval.h classobject.h cobject.h \
+_threadmodule.obj: abstract.h ceval.h classobject.h cobject.h \
complexobject.h pyconfig.h dictobject.h fileobject.h floatobject.h \
funcobject.h import.h intobject.h intrcheck.h listobject.h \
longobject.h methodobject.h modsupport.h moduleobject.h mymalloc.h \