remove deprecated PERL_OBJECT cruft, it has long since stopped

working in 5.7.x

p4raw-id: //depot/perl@11803

9 files changed, 27 insertions, 102 deletions

diff --git a/NetWare/Makefile b/NetWare/Makefile
index 01daccc44c..ec06f7c395 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -463,17 +463,6 @@ USE_IMP_SYS	= define
 #
 #USE_5005THREADS= define
 
-#
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_MULTI instead).
-#
-# uncomment next line if you want to use the PERL_OBJECT build option.
-# DO NOT ENABLE unless you have legacy code that relies on the C++
-# CPerlObj class that was available in 5.005.  This cannot be enabled
-# if you ask for USE_5005THREADS above.
-#
-#USE_OBJECT	= define
-
 # For now let this be here
 #
 #CRYPT_SRC	= fcrypt.c
@@ -510,13 +499,6 @@ D_CRYPT		= define
 CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-PERL_MALLOC	= undef
-USE_5005THREADS	= undef
-USE_MULTI	= undef
-USE_IMP_SYS	= define
-!ENDIF
-
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC	= undef
 !ENDIF
@@ -537,10 +519,6 @@ PERL_MALLOC	= undef
 USE_MULTI	= undef
 !ENDIF
 
-!IF "$(USE_OBJECT)" == ""
-USE_OBJECT	= undef
-!ENDIF
-
 !IF "$(USE_ITHREADS)" == ""
 USE_ITHREADS	= undef
 !ENDIF
@@ -553,16 +531,16 @@ USE_IMP_SYS	= undef
 USE_PERLCRT	= undef
 !ENDIF
 
-!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
 USE_MULTI	= define
 !ENDIF
 
-!IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	= define
 USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -574,9 +552,6 @@ BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-object
-!ELSE
 !IF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
@@ -586,9 +561,8 @@ ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME	= NetWare-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
-!ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
 ADD_BUILDOPT	= $(ADD_BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -630,11 +604,6 @@ INST_HTML	= $(INST_POD)\html
 # Options
 #
 
-!IF "$(USE_OBJECT)" == "define"
-OPTIMIZE	= $(OPTIMIZE) $(CXX_FLAG)
-BUILDOPT	= $(BUILDOPT) -DPERL_OBJECT
-!ENDIF
-
 OBJOUT_FLAG	= -Fo
 EXEOUT_FLAG	= -Fe
 
@@ -736,9 +705,7 @@ MICROCORE_SRC	=		\
 EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\malloc.c
 !ENDIF
 
-#!IF "$(USE_OBJECT)" != "define"
 #EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\perlio.c
-#!ENDIF
 
 !IF "$(CRYPT_SRC)" != ""
 NW_SRC	= $(NW_SRC) .\$(CRYPT_SRC)
diff --git a/NetWare/config_h.PL b/NetWare/config_h.PL
index a7e5a0940c..d0eb05a30f 100644
--- a/NetWare/config_h.PL
+++ b/NetWare/config_h.PL
@@ -2,7 +2,6 @@
 use Config;
 use File::Compare qw(compare);
 use File::Copy qw(copy);
-my $OBJ   = 1 if $Config{'ccflags'} =~ /PERL_OBJECT/i;
 my $name = $0;
 $name =~ s#^(.*)\.PL$#../$1.SH#;
 my %opt;
@@ -78,7 +77,7 @@ chmod(0666,"../lib/CORE/config.h");
 copy("$file.new","../lib/CORE/config.h") || die "Cannot copy:$!";
 chmod(0444,"../lib/CORE/config.h");
 
-if (!$OBJ && compare("$file.new",$file))
+if (compare("$file.new",$file))
  {
   warn "$file has changed\n";
   chmod(0666,$file);
diff --git a/NetWare/dl_netware.xs b/NetWare/dl_netware.xs
index 2f466ca499..11f2444ab2 100644
--- a/NetWare/dl_netware.xs
+++ b/NetWare/dl_netware.xs
@@ -27,23 +27,19 @@ NetWare related modifications done on dl_win32.xs file created by Wei-Yuen Tan t
 //function pointer for UCSInitialize
 typedef void (*PFUCSINITIALIZE) ();
 
-#ifdef PERL_OBJECT
-
-#endif  /* PERL_OBJECT */
-
 #include "dlutils.c"	/* SaveError() etc	*/
 
 static void
-dl_private_init(pTHXo)
+dl_private_init(pTHX)
 {
-    (void)dl_generic_private_init(aTHXo);
+    (void)dl_generic_private_init(aTHX);
 }
 
 
 MODULE = DynaLoader	PACKAGE = DynaLoader
 
 BOOT:
-    (void)dl_private_init(aTHXo);
+    (void)dl_private_init(aTHX);
 
 
 void *
@@ -130,8 +126,8 @@ dl_load_file(filename,flags=0)
 			DLDEBUG(2,PerlIO_printf(Perl_debug_log," libref=%x\n", nlmHandle));
 			ST(0) = sv_newmortal() ;
 			if (nlmHandle == NULL)
-			//SaveError(aTHXo_ "load_file:%s",
-			//	  OS_Error_String(aTHXo)) ;
+			//SaveError(aTHX_ "load_file:%s",
+			//	  OS_Error_String(aTHX)) ;
 			ConsolePrintf("load_file error :  %s\n", mod_name8);
 			else
 			sv_setiv( ST(0), (IV)nlmHandle);
@@ -156,8 +152,8 @@ dl_find_symbol(libhandle, symbolname)
     DLDEBUG(2,PerlIO_printf(Perl_debug_log,"  symbolref = %x\n", RETVAL));
     ST(0) = sv_newmortal() ;
     if (RETVAL == NULL)
-	//SaveError(aTHXo_ "find_symbol:%s",
-	//	  OS_Error_String(aTHXo)) ;
+	//SaveError(aTHX_ "find_symbol:%s",
+	//	  OS_Error_String(aTHX)) ;
 	ConsolePrintf("find_symbol error \n");
     else
 	sv_setiv( ST(0), (IV)RETVAL);
@@ -178,7 +174,7 @@ dl_install_xsub(perl_name, symref, filename="$Package")
     DLDEBUG(2,PerlIO_printf(Perl_debug_log,"dl_install_xsub(name=%s, symref=%x)\n",
 		      perl_name, symref));
     ST(0) = sv_2mortal(newRV((SV*)newXS(perl_name,
-					(void(*)(pTHXo_ CV *))symref,
+					(void(*)(pTHX_ CV *))symref,
 					filename)));
 
 
diff --git a/NetWare/interface.c b/NetWare/interface.c
index c526fbd6be..43cf81a464 100644
--- a/NetWare/interface.c
+++ b/NetWare/interface.c
@@ -24,7 +24,7 @@ static void xs_init(pTHX);
 
 EXTERN_C int RunPerl(int argc, char **argv, char **env);
 EXTERN_C void Perl_nw5_init(int *argcp, char ***argvp);
-EXTERN_C void boot_DynaLoader (pTHXo_ CV* cv);
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
 
 ClsPerlHost::ClsPerlHost()
@@ -141,23 +141,7 @@ int RunPerl(int argc, char **argv, char **env)
 		if(exitstatus == 0)
 		{
 			#if defined(TOP_CLONE) && defined(USE_ITHREADS)		// XXXXXX testing
-				#  ifdef PERL_OBJECT
-					CPerlHost *h = new CPerlHost();
-					new_perl = perl_clone_using(my_perl, 1,
-										h->m_pHostperlMem,
-										h->m_pHostperlMemShared,
-										h->m_pHostperlMemParse,
-										h->m_pHostperlEnv,
-										h->m_pHostperlStdIO,
-										h->m_pHostperlLIO,
-										h->m_pHostperlDir,
-										h->m_pHostperlSock,
-										h->m_pHostperlProc
-										);
-					CPerlObj *pPerl = (CPerlObj*)new_perl;
-				#  else
-					new_perl = perl_clone(my_perl, 1);
-				#  endif
+				new_perl = perl_clone(my_perl, 1);
 
 				exitstatus = perl_run(new_perl);	// Run Perl.
 				PERL_SET_THX(my_perl);
diff --git a/NetWare/nw5.c b/NetWare/nw5.c
index a701c654d0..44bb853802 100644
--- a/NetWare/nw5.c
+++ b/NetWare/nw5.c
@@ -17,7 +17,7 @@
 
 
 
-#include <perl.h>	// For dTHXo, etc.
+#include <perl.h>	// For dTHX, etc.
 #include "nwpipe.h"
 
 
@@ -211,7 +211,7 @@ nw_stdout()
 long
 nw_telldir(DIR *dirp)
 {
-	dTHXo;
+	dTHX;
 	Perl_croak(aTHX_ "telldir function is not implemented");
 	return 0l;
 }
@@ -292,7 +292,7 @@ nw_write(int fd, const void *buf, unsigned int cnt)
 char *
 nw_crypt(const char *txt, const char *salt)
 {
-	 dTHXo;
+	 dTHX;
 
 #ifdef HAVE_DES_FCRYPT
     dTHR;
@@ -752,7 +752,7 @@ nw_rename(const char *oname, const char *newname)
 void
 nw_rewinddir(DIR *dirp)
 {
-	dTHXo;
+	dTHX;
 	Perl_croak(aTHX_ "rewinddir function is not implemented");
 }
 
@@ -766,7 +766,7 @@ nw_rewind(FILE *pf)
 void
 nw_seekdir(DIR *dirp, long loc)
 {
-	dTHXo;
+	dTHX;
 	Perl_croak(aTHX_ "seekdir function is not implemented");
 }
 
diff --git a/NetWare/nw5sck.c b/NetWare/nw5sck.c
index 5a9ce47f6d..c1a42fea80 100644
--- a/NetWare/nw5sck.c
+++ b/NetWare/nw5sck.c
@@ -20,11 +20,6 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-#if defined(PERL_OBJECT)
-#define NO_XSLOCKS
-#include "XSUB.h"
-#endif
-
 #include "nw5iop.h"
 #include "nw5sck.h"
 #include <fcntl.h>
diff --git a/NetWare/nw5thread.c b/NetWare/nw5thread.c
index e99512afbf..7ed18bbeaf 100644
--- a/NetWare/nw5thread.c
+++ b/NetWare/nw5thread.c
@@ -20,12 +20,6 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-#if defined(PERL_OBJECT)
-#define NO_XSLOCKS
-extern CPerlObj* pPerl;
-#include "XSUB.h"
-#endif
-
 //For Thread Local Storage
 #include "win32ish.h"		// For "BOOL", "TRUE" and "FALSE"
 #include "nwtinfo.h"
diff --git a/NetWare/nwperlsys.c b/NetWare/nwperlsys.c
index b1bf8ddd69..4fc65d31f0 100644
--- a/NetWare/nwperlsys.c
+++ b/NetWare/nwperlsys.c
@@ -20,10 +20,6 @@
 #include "perl.h"
 
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif
-
 //CHKSGP
 //Including this is giving premature end-of-file error during compilation
 //#include "XSUB.h"
@@ -102,9 +98,6 @@ perl_alloc(void)
 				   &perlSock,
 				   &perlProc);
 	if (my_perl) {
-#ifdef PERL_OBJECT
-	    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
 		//nw5_internal_host = m_allocList;
 	}
     return my_perl;
@@ -188,9 +181,6 @@ perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
 				   lpProc);
 	
 	if (my_perl) {
-#ifdef PERL_OBJECT
-	    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
 	    //nw5_internal_host = pHost;
 	}
     return my_perl;
diff --git a/NetWare/nwperlsys.h b/NetWare/nwperlsys.h
index 0b7271daaf..955e7c179b 100644
--- a/NetWare/nwperlsys.h
+++ b/NetWare/nwperlsys.h
@@ -647,7 +647,7 @@ PerlLIOChmod(struct IPerlLIO* piPerl, const char *filename, int pmode)
 int
 PerlLIOChown(struct IPerlLIO* piPerl, const char *filename, uid_t owner, gid_t group)
 {
-	dTHXo;
+	dTHX;
     Perl_croak(aTHX_ "chown not implemented!\n");
 	return 0;
 }
@@ -861,7 +861,7 @@ PerlProc_Exit(struct IPerlProc* piPerl, int status)
 int
 PerlProcExecl(struct IPerlProc* piPerl, const char *cmdname, const char *arg0, const char *arg1, const char *arg2, const char *arg3)
 {
-	dTHXo;
+	dTHX;
     Perl_croak(aTHX_ "execl not implemented!\n");
 	return 0;
 }
@@ -917,7 +917,7 @@ PerlProcKill(struct IPerlProc* piPerl, int pid, int sig)
 int
 PerlProcKillpg(struct IPerlProc* piPerl, int pid, int sig)
 {
-    dTHXo;
+    dTHX;
     Perl_croak(aTHX_ "killpg not implemented!\n");
     return 0;
 }
@@ -931,7 +931,7 @@ PerlProcPauseProc(struct IPerlProc* piPerl)
 PerlIO*
 PerlProcPopen(struct IPerlProc* piPerl, const char *command, const char *mode)
 {
-    dTHXo;
+    dTHX;
     PERL_FLUSHALL_FOR_CHILD;
 
 	return (PerlIO*)nw_Popen((char *)command, (char *)mode, (int *)errno);
@@ -1300,7 +1300,7 @@ PerlSockSetservent(struct IPerlSock* piPerl, int stayopen)
 int
 PerlSockSetsockopt(struct IPerlSock* piPerl, SOCKET s, int level, int optname, const char* optval, int optlen)
 {
-	dTHXo;
+	dTHX;
     Perl_croak(aTHX_ "setsockopt not implemented!\n");
 	return 0;
 }
@@ -1320,7 +1320,7 @@ PerlSockSocket(struct IPerlSock* piPerl, int af, int type, int protocol)
 int
 PerlSockSocketpair(struct IPerlSock* piPerl, int domain, int type, int protocol, int* fds)
 {
-    dTHXo;
+    dTHX;
     Perl_croak(aTHX_ "socketpair not implemented!\n");
     return 0;
 }
@@ -1328,7 +1328,7 @@ PerlSockSocketpair(struct IPerlSock* piPerl, int domain, int type, int protocol,
 int
 PerlSockIoctlsocket(struct IPerlSock* piPerl, SOCKET s, long cmd, u_long *argp)
 {
-	dTHXo;
+	dTHX;
     Perl_croak(aTHX_ "ioctlsocket not implemented!\n");
 	return 0;
 }