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

diff --git a/makedef.pl b/makedef.pl
index 9c8a65e..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,13 +193,14 @@ 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};
     }
 }
 
+
 if ($PLATFORM eq 'win32') {
     skip_symbols [qw(
 		     PL_statusvalue_vms
@@ -246,6 +235,7 @@ if ($PLATFORM eq 'win32') {
 		     Perl_my_chsize
 		     Perl_same_dirent
 		     Perl_setenv_getix
+		     Perl_sortsv
 		     Perl_unlnk
 		     Perl_watch
 		     Perl_safexcalloc
@@ -296,6 +286,8 @@ elsif ($PLATFORM eq 'os2') {
 		    ctermid
 		    get_sysinfo
 		    Perl_OS2_init
+		    Perl_OS2_init3
+		    Perl_OS2_term
 		    OS2_Perl_data
 		    dlopen
 		    dlsym
@@ -469,14 +461,16 @@ unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
 		    )];
 }
 
+unless ($define{'USE_REENTRANT_API'}) {
+    skip_symbols [qw(
+		    PL_reentrant_buffer
+		    )];
+}
+
 if ($define{'MYMALLOC'}) {
     emit_symbols [qw(
 		    Perl_dump_mstats
 		    Perl_get_mstats
-		    Perl_malloc
-		    Perl_mfree
-		    Perl_realloc
-		    Perl_calloc
 		    Perl_strdup
 		    Perl_putenv
 		    )];
@@ -496,10 +490,6 @@ else {
 		    PL_malloc_mutex
 		    Perl_dump_mstats
 		    Perl_get_mstats
-		    Perl_malloc
-		    Perl_mfree
-		    Perl_realloc
-		    Perl_calloc
 		    Perl_malloced_size
 		    )];
 }
@@ -543,6 +533,10 @@ unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
 		    PL_ptr_table
 		    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
@@ -565,6 +559,13 @@ unless ($define{'USE_ITHREADS'}) {
 		    Perl_ptr_table_store
 		    perl_clone
 		    perl_clone_using
+		    Perl_sharedsv_find
+		    Perl_sharedsv_init
+		    Perl_sharedsv_lock
+		    Perl_sharedsv_new
+		    Perl_sharedsv_thrcnt_dec
+		    Perl_sharedsv_thrcnt_inc
+		    Perl_sharedsv_unlock
 		    )];
 }
 
@@ -728,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;
@@ -757,7 +758,7 @@ else {
 sub try_symbol {
     my $symbol = shift;
 
-    return if $symbol !~ /^[A-Za-z]/;
+    return if $symbol !~ /^[A-Za-z_]/;
     return if $symbol =~ /^\#/;
     $symbol =~s/\r//g;
     chomp($symbol);
@@ -1051,6 +1052,7 @@ foreach my $symbol (qw(
 			nw_setnetent
 			nw_setprotoent
 			nw_setservent
+			nw_setsockopt
 			nw_shutdown
 			nw_crypt
 			nw_execvp
@@ -1154,6 +1156,7 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
+Perl_cxinc
 PerlIO_define_layer
 PerlIOBuf_set_ptrcnt
 PerlIOBuf_get_cnt