X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=makedef.pl;h=c10eeb7ff87c88698313646cc406c9e5b2e8a425;hb=59605c55ab2c5e30f2d7f87475cfb2ea195a263d;hp=ed1204e65dc3f812c40c71a0bb278ea70a7a7859;hpb=322806ff874dea1b4b9bb7c9d527befaabdc71b8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/makedef.pl b/makedef.pl
index ed1204e..c10eeb7 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -116,7 +116,7 @@ close(CFG);
 # perl.h logic duplication begins
 
 if ($define{USE_ITHREADS}) {
-    if (!$define{MULTIPLICITY} && !$define{PERL_OBJECT}) {
+    if (!$define{MULTIPLICITY}) {
         $define{MULTIPLICITY} = 1;
     }
 }
@@ -126,18 +126,6 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_5005THREADS}  ||
     $define{MULTIPLICITY} ;
 
-if ($define{PERL_CAPI}) {
-    delete $define{PERL_OBJECT};
-    $define{MULTIPLICITY} = 1;
-    $define{PERL_IMPLICIT_CONTEXT} = 1;
-    $define{PERL_IMPLICIT_SYS}     = 1;
-}
-
-if ($define{PERL_OBJECT}) {
-    $define{PERL_IMPLICIT_CONTEXT} = 1;
-    $define{PERL_IMPLICIT_SYS}     = 1;
-}
-
 # perl.h logic duplication ends
 
 if ($PLATFORM eq 'win32') {
@@ -205,14 +193,13 @@ sub emit_symbols {
     foreach my $symbol (@$list) {
 	my $skipsym = $symbol;
 	# XXX hack
-	if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) {
+	if ($define{MULTIPLICITY}) {
 	    $skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/;
 	}
 	emit_symbol($symbol) unless exists $skip{$skipsym};
     }
 }
 
-skip_symbols [qw(Perl_custom_op_name Perl_custom_op_desc PL_custom_op_descs PL_custom_op_names)] unless $define{'PERL_CUSTOM_OPS'};
 
 if ($PLATFORM eq 'win32') {
     skip_symbols [qw(
@@ -248,6 +235,7 @@ if ($PLATFORM eq 'win32') {
 		     Perl_my_chsize
 		     Perl_same_dirent
 		     Perl_setenv_getix
+		     Perl_sortsv
 		     Perl_unlnk
 		     Perl_watch
 		     Perl_safexcalloc
@@ -547,6 +535,8 @@ unless ($define{'USE_ITHREADS'}) {
 		    PL_op_mutex
 		    PL_regex_pad
 		    PL_regex_padav
+		    PL_sharedsv_space
+		    PL_sharedsv_space_mutex
 		    Perl_dirp_dup
 		    Perl_cx_dup
 		    Perl_si_dup
@@ -739,7 +729,7 @@ for my $syms (@syms) {
 
 # variables
 
-if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) {
+if ($define{'MULTIPLICITY'}) {
     for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) {
 	my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
 	emit_symbols $glob;
@@ -1062,6 +1052,7 @@ foreach my $symbol (qw(
 			nw_setnetent
 			nw_setprotoent
 			nw_setservent
+			nw_setsockopt
 			nw_shutdown
 			nw_crypt
 			nw_execvp
@@ -1165,6 +1156,7 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
+Perl_cxinc
 PerlIO_define_layer
 PerlIOBuf_set_ptrcnt
 PerlIOBuf_get_cnt