Permalink
Browse files

remove deprecated PERL_OBJECT cruft, it has long since stopped

working in 5.7.x

p4raw-id: //depot/perl@11803
  • Loading branch information...
Gurusamy Sarathy
Gurusamy Sarathy committed Aug 31, 2001
1 parent 25f58ae commit acfe0abcedaf592fb4b9cb69ce3468308ae99d91
Showing with 1,637 additions and 13,369 deletions.
  1. +1 −1 EXTERN.h
  2. +1 −2 MANIFEST
  3. +2 −2 Makefile.SH
  4. +1 −1 Makefile.micro
  5. +4 −37 NetWare/Makefile
  6. +1 −2 NetWare/config_h.PL
  7. +8 −12 NetWare/dl_netware.xs
  8. +2 −18 NetWare/interface.c
  9. +5 −5 NetWare/nw5.c
  10. +0 −5 NetWare/nw5sck.c
  11. +0 −6 NetWare/nw5thread.c
  12. +0 −10 NetWare/nwperlsys.c
  13. +7 −7 NetWare/nwperlsys.h
  14. +0 −1 Porting/makerel
  15. +722 −722 README.win32
  16. +5 −6 XSUB.h
  17. +3 −10 bytecode.pl
  18. +1 −1 cv.h
  19. +3 −3 cygwin/cygwin.c
  20. +2 −2 emacs/ptags
  21. +40 −3,022 embed.h
  22. +36 −329 embed.pl
  23. +4 −435 embedvar.h
  24. +3 −3 epoc/epoc.c
  25. +0 −9 ext/B/B.xs
  26. +1 −1 ext/B/B/C.pm
  27. +2 −2 ext/ByteLoader/ByteLoader.xs
  28. +1 −1 ext/ByteLoader/bytecode.h
  29. +2 −9 ext/ByteLoader/byterun.c
  30. +3 −3 ext/DynaLoader/dlutils.c
  31. +0 −2 ext/Opcode/Opcode.xs
  32. +1 −1 ext/POSIX/POSIX.xs
  33. +0 −68 globals.c
  34. +0 −5 iperlsys.h
  35. +2 −6 lib/ExtUtils/Embed.pm
  36. +0 −1 lib/ExtUtils/MM_NW5.pm
  37. +1 −25 lib/ExtUtils/MM_Unix.pm
  38. +0 −1 lib/ExtUtils/MM_Win32.pm
  39. +1 −12 lib/ExtUtils/MakeMaker.pm
  40. +1 −6 lib/ExtUtils/xsubpp
  41. +3 −15 makedef.pl
  42. +11 −15 mg.c
  43. +0 −2,493 objXSUB.h
  44. +2 −2 op.c
  45. +55 −120 perl.c
  46. +19 −172 perl.h
  47. +5 −4,393 perlapi.c
  48. +424 −431 perlapi.h
  49. +1 −1 perlio.c
  50. +2 −6 perly.c
  51. +1 −1 perly.y
  52. +2 −6 perly_c.diff
  53. +14 −31 pod/perlguts.pod
  54. +26 −56 pp_ctl.c
  55. +3 −3 pp_hot.c
  56. +0 −33 proto.h
  57. +3 −13 regcomp.c
  58. +4 −14 regexec.c
  59. +1 −1 scope.c
  60. +11 −45 sv.c
  61. +1 −1 sv.h
  62. +7 −11 toke.c
  63. +3 −3 universal.c
  64. +4 −7 vms/descrip_mms.template
  65. +2 −6 vms/perly_c.vms
  66. +4 −37 win32/Makefile
  67. +1 −2 win32/config_h.PL
  68. +9 −13 win32/dl_win32.xs
  69. +5 −33 win32/makefile.mk
  70. +20 −32 win32/perlhost.h
  71. +3 −131 win32/perllib.c
  72. +55 −82 win32/win32.c
  73. +1 −54 win32/win32.h
  74. +18 −23 win32/win32sck.c
  75. +0 −6 win32/win32thread.c
  76. +3 −21 wince/Makefile.ce
  77. +1 −2 wince/config_h.PL
  78. +9 −13 wince/dl_win32.xs
  79. +2 −130 wince/perllib.c
  80. +1 −54 wince/win32.h
  81. +0 −6 wince/win32thread.c
  82. +10 −27 wince/wince.c
  83. +17 −22 wince/wincesck.c
  84. +8 −8 xsutils.c
View
@@ -27,7 +27,7 @@
# define EXTCONST globalref
# define dEXTCONST globaldef {"$GLOBAL_RO_VARS"} readonly
#else
-# if defined(WIN32) && !defined(PERL_STATIC_SYMS) && !defined(PERL_OBJECT)
+# if defined(WIN32) && !defined(PERL_STATIC_SYMS)
# ifdef PERLDLL
# define EXT extern __declspec(dllexport)
# define dEXT
View
@@ -42,7 +42,7 @@ emacs/cperl-mode.el An alternate perl-mode
emacs/e2ctags.pl etags to ctags converter
emacs/ptags Creates smart TAGS file
embed.h Maps symbols to safer names
-embed.pl Produces {embed,embedvar,objXSUB,proto}.h, global.sym
+embed.pl Produces {embed,embedvar,proto}.h, global.sym
embedvar.h C namespace management
epoc/config.sh EPOC port config.sh template
epoc/createpkg.pl EPOC port generate PKG file
@@ -1606,7 +1606,6 @@ NetWare/testnlm/type/type.c Netware port
NetWare/win32ish.h Netware port
nostdio.h Cause compile error on stdio calls
numeric.c Miscellaneous numeric conversion routines
-objXSUB.h Scoping macros for Perl Object in extensions
op.c Opcode syntax tree code
op.h Opcode syntax tree header
opcode.h Automatically generated opcode header
View
@@ -773,7 +773,7 @@ CHMOD_W = chmod +w
# keywords.pl: keywords.h
# opcode.pl: opcode.h opnames.h pp_proto.h pp.sym
# [* embed.pl needs pp.sym generated by opcode.pl! *]
-# embed.pl: proto.h embed.h embedvar.h global.sym objXSUB.h
+# embed.pl: proto.h embed.h embedvar.h global.sym
# perlapi.h perlapi.c pod/perlintern.pod
# pod/perlapi.pod
# bytecode.pl: ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c
@@ -788,7 +788,7 @@ CHMOD_W = chmod +w
AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \
embed.h embedvar.h global.sym \
pod/perlintern.pod pod/perlapi.pod \
- objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \
+ perlapi.h perlapi.c ext/ByteLoader/byterun.h \
ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \
warnings.h lib/warnings.pm
View
@@ -122,7 +122,7 @@ ulocale$(_O): $(HE) locale.c
unumeric$(_O): $(HE) numeric.c
$(CC) -c -o $@ $(CFLAGS) numeric.c
-uuniversal$(_O): $(HE) universal.c objXSUB.h XSUB.h
+uuniversal$(_O): $(HE) universal.c XSUB.h
$(CC) -c -o $@ $(CFLAGS) universal.c
uutf8$(_O): $(HE) utf8.c
View
@@ -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)
View
@@ -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);
View
@@ -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)));
View
@@ -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);
View
@@ -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");
}
View
@@ -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>
View
@@ -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"
View
@@ -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;
Oops, something went wrong.

0 comments on commit acfe0ab

Please sign in to comment.