X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/207f9c165d175758399b873595702060df2a94eb..a3167221c5c86fcb0d7f6497651ad0157ad5776e:/makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 376f328..2b8e636b 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') {
@@ -148,6 +136,7 @@ if ($PLATFORM eq 'win32') {
     if ($define{PERL_IMPLICIT_SYS}) {
 	output_symbol("perl_get_host_info");
 	output_symbol("perl_alloc_override");
+    output_symbol("perl_clone_host");
     }
 }
 elsif ($PLATFORM eq 'os2') {
@@ -185,6 +174,7 @@ elsif ($PLATFORM eq 'netware') {
 	if ($define{PERL_IMPLICIT_SYS}) {
 	output_symbol("perl_get_host_info");
 	output_symbol("perl_alloc_override");
+    output_symbol("perl_clone_host");
 	}
 }
 
@@ -203,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
@@ -294,6 +285,8 @@ elsif ($PLATFORM eq 'os2') {
 		    ctermid
 		    get_sysinfo
 		    Perl_OS2_init
+		    Perl_OS2_init3
+		    Perl_OS2_term
 		    OS2_Perl_data
 		    dlopen
 		    dlsym
@@ -340,6 +333,8 @@ elsif ($PLATFORM eq 'os2') {
 		    init_PMWIN_entries
 		    PMWIN_entries
 		    Perl_hab_GET
+		    loadByOrdinal
+		    pExtFCN
 		    )]);
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -465,14 +460,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
 		    )];
@@ -492,10 +489,6 @@ else {
 		    PL_malloc_mutex
 		    Perl_dump_mstats
 		    Perl_get_mstats
-		    Perl_malloc
-		    Perl_mfree
-		    Perl_realloc
-		    Perl_calloc
 		    Perl_malloced_size
 		    )];
 }
@@ -539,6 +532,8 @@ unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
 		    PL_ptr_table
 		    PL_op_mutex
+		    PL_regex_pad
+		    PL_regex_padav
 		    Perl_dirp_dup
 		    Perl_cx_dup
 		    Perl_si_dup
@@ -561,6 +556,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
 		    )];
 }
 
@@ -724,7 +726,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;
@@ -753,7 +755,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);
@@ -1150,6 +1152,7 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
+Perl_cxinc
 PerlIO_define_layer
 PerlIOBuf_set_ptrcnt
 PerlIOBuf_get_cnt