tidy sv.[ch] after CRIPPLED_CC removal

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index b75eff9..2639838 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -116,21 +116,29 @@ close(CFG);
 
 # perl.h logic duplication begins
 
+if ($define{PERL_IMPLICIT_SYS}) {
+    $define{PL_OP_SLAB_ALLOC} = 1;
+}
+
 if ($define{USE_ITHREADS}) {
     if (!$define{MULTIPLICITY}) {
         $define{MULTIPLICITY} = 1;
     }
 }
 
-my $sym_ord = 0;
-
 $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_ITHREADS} ||
     $define{USE_5005THREADS}  ||
     $define{MULTIPLICITY} ;
 
+if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
+    $define{USE_REENTRANT_API} = 1;
+}
+
 # perl.h logic duplication ends
 
+my $sym_ord = 0;
+
 if ($PLATFORM eq 'win32') {
     warn join(' ',keys %define)."\n";
     print "LIBRARY Perl57\n";
@@ -139,7 +147,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");
+       output_symbol("perl_clone_host");
     }
 }
 elsif ($PLATFORM eq 'os2') {
@@ -187,9 +195,9 @@ elsif ($PLATFORM eq 'netware') {
        print "EXPORTS\n";
        }
        if ($define{PERL_IMPLICIT_SYS}) {
-       output_symbol("perl_get_host_info");
-       output_symbol("perl_alloc_override");
-       output_symbol("perl_clone_host");
+           output_symbol("perl_get_host_info");
+           output_symbol("perl_alloc_override");
+           output_symbol("perl_clone_host");
        }
 }
 
@@ -613,6 +621,14 @@ unless ($define{'FAKE_THREADS'}) {
     skip_symbols [qw(PL_curthr)];
 }
 
+unless ($define{'PL_OP_SLAB_ALLOC'}) {
+    skip_symbols [qw(
+                     PL_OpPtr
+                     PL_OpSlab
+                     PL_OpSpace
+                    )];
+}
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };