Happy chainsaw stories; The removal of the 5005 threads

Still imcomplete. Configure will follow

p4raw-id: //depot/perl@18030

5 files changed, 7 insertions, 40 deletions

diff --git a/NetWare/Makefile b/NetWare/Makefile
index 9121f4f74b..e3e2a538f3 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -285,9 +285,7 @@ NW_CFG_VARS = \
 		"static_ext=$(STATIC_EXT)"		\
 		"dynamic_ext=$(DYNAMIC_EXT)"		\
 		"nonxs_ext=$(NONXS_EXT)"		\
-		"use5005threads=$(USE_5005THREADS)"	\
 		"useithreads=$(USE_ITHREADS)"		\
-		"usethreads=$(USE_5005THREADS)"		\
 		"usemultiplicity=$(USE_MULTI)"		\
 		"ld=$(LINK)"			\
 		"base_import=$(BASE_IMPORT_FILES)"	\
@@ -505,15 +503,6 @@ USE_IMP_SYS	= define
 # else USE_STDIO will be defined.
 #USE_PERLIO	= define
 #USE_STDIO = define
-#
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_ITHREADS instead).
-#
-# uncomment to enable threads-capabilities.  This is incompatible with
-# USE_ITHREADS, and is only here for people who may have come to rely
-# on the experimental Thread support that was in 5.005.
-#
-#USE_5005THREADS= define
 
 # For now let this be here
 #
@@ -555,14 +544,6 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 PERL_MALLOC	= undef
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == ""
-USE_5005THREADS	= undef
-!ENDIF
-
-!IF "$(USE_5005THREADS)" == "define"
-USE_ITHREADS	= undef
-!ENDIF
-
 !IF "$(USE_IMP_SYS)" == "define"
 PERL_MALLOC	= undef
 !ENDIF
@@ -583,16 +564,15 @@ USE_IMP_SYS	= undef
 USE_PERLCRT	= undef
 !ENDIF
 
-!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	= define
 !ENDIF
 
 !IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	= define
-USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
+!IF "$(USE_MULTI)" != "undef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -604,17 +584,13 @@ BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == "define"
-ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-thread
-!ELSE
 !IF "$(USE_MULTI)" == "define"
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-multi
 !ELSE
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
-!ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
+!IF "$(USE_MULTI)" != "undef"
 ADD_BUILDOPT	= $(ADD_BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 28d22903e2..26edbb8b80 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -860,7 +860,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usedl='define'
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index c3a0d94555..9573a12317 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -3185,10 +3185,6 @@
  *	This symbol, if defined, indicates that Perl should be built to
  *	use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *	This symbol, if defined, indicates that Perl should be built to
- *	use the 5.005-based threading implementation.
- */
 /* OLD_PTHREADS_API:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use the old draft POSIX threads API.
@@ -3198,11 +3194,7 @@
  *	try to use the various _r versions of library functions.
  *	This is extremely experimental.
  */
-/*#define	USE_5005THREADS		/**/
 #define	USE_ITHREADS		/**/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define		USE_5005THREADS		/* until src is revised*/
-#endif
 /*#define	OLD_PTHREADS_API		/**/
 /*#define	USE_REENTRANT_API	/**/
 
diff --git a/NetWare/nw5thread.c b/NetWare/nw5thread.c
index 7ed18bbeaf..9ff2c32605 100644
--- a/NetWare/nw5thread.c
+++ b/NetWare/nw5thread.c
@@ -32,7 +32,7 @@ __declspec(thread) void *PL_current_context = NULL;
 void
 Perl_set_context(void *t)
 {
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
 #  ifdef USE_DECLSPEC_THREAD
     Perl_current_context = t;
 #  else
@@ -45,7 +45,7 @@ Perl_set_context(void *t)
 void *
 Perl_get_context(void)
 {
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
 #  ifdef USE_DECLSPEC_THREAD
     return Perl_current_context;
 #  else
@@ -61,7 +61,7 @@ Perl_get_context(void)
 BOOL
 Remove_Thread_Ctx(void)
 {
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
 #  ifdef USE_DECLSPEC_THREAD
 	return TRUE;
 #  else
diff --git a/NetWare/nw5thread.h b/NetWare/nw5thread.h
index c4e17d15cf..ad70db01fa 100644
--- a/NetWare/nw5thread.h
+++ b/NetWare/nw5thread.h
@@ -32,7 +32,7 @@ typedef long perl_key;
 // Ananth, 3 Sept 2001
 typedef struct nw_cond { long waiters; unsigned int sem; } perl_cond;
 
-#if (defined (USE_ITHREADS) || defined (USE_5005THREADS)) && defined(MPK_ON)
+#if defined (USE_ITHREADS) && defined(MPK_ON)
 #ifdef __cplusplus
 extern "C"
 {