In makedef.pl, remove a redundant check for MULTIPLICITY.

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 9e261e5..810a4c8 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -189,7 +189,7 @@ my $sym_ord = 0;
 print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n";
 
 if ($PLATFORM =~ /^win(?:32|ce)$/) {
-    (my $dll = ($define{PERL_DLL} || "perl511")) =~ s/\.dll$//i;
+    (my $dll = ($define{PERL_DLL} || "perl513")) =~ s/\.dll$//i;
     print "LIBRARY $dll\n";
     # The DESCRIPTION module definition file statement is not supported
     # by VC7 onwards.
@@ -245,7 +245,7 @@ elsif ($PLATFORM eq 'aix') {
 }
 elsif ($PLATFORM eq 'netware') {
        if ($FILETYPE eq 'def') {
-       print "LIBRARY perl511\n";
+       print "LIBRARY perl513\n";
        print "DESCRIPTION 'Perl interpreter for NetWare'\n";
        print "EXPORTS\n";
        }
@@ -758,8 +758,11 @@ unless ($define{'USE_ITHREADS'}) {
                    PL_sharedsv_space_mutex
                    PL_dollarzero_mutex
                    PL_hints_mutex
+                   PL_my_ctx_mutex
                    PL_perlio_mutex
                    PL_regdupe
+                   Perl_clone_params_del
+                   Perl_clone_params_new
                    Perl_parser_dup
                    Perl_dirp_dup
                    Perl_cx_dup
@@ -773,6 +776,7 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_mro_meta_dup
                    Perl_re_dup_guts
                    Perl_sv_dup
+                   Perl_sv_dup_inc
                    Perl_rvpv_dup
                    Perl_hek_dup
                    Perl_sys_intern_dup
@@ -793,7 +797,6 @@ unless ($define{'USE_ITHREADS'}) {
 
 unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
     skip_symbols [qw(
-                   PL_my_ctx_mutex
                    PL_my_cxt_index
                    PL_my_cxt_list
                    PL_my_cxt_size
@@ -1223,6 +1226,10 @@ if ($define{'MULTIPLICITY'}) {
        my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
        emit_symbols $glob;
     }
+    unless ($define{'USE_ITHREADS'}) {
+       # XXX needed for XS extensions that define PERL_CORE
+       emit_symbol("PL_curinterp");
+    }
     # XXX AIX seems to want the perlvars.h symbols, for some reason
     if ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') {    # OS/2 needs PL_thr_key
        my $glob = readvar($perlvars_h);
@@ -1234,10 +1241,8 @@ else {
        my $glob = readvar($perlvars_h);
        emit_symbols $glob;
     }
-    unless ($define{'MULTIPLICITY'}) {
-       my $glob = readvar($intrpvar_h);
-       emit_symbols $glob;
-    }
+    my $glob = readvar($intrpvar_h);
+    emit_symbols $glob;
 }
 
 sub try_symbol {
@@ -1284,6 +1289,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_open
                            win32_close
                            win32_eof
+                           win32_isatty
                            win32_read
                            win32_write
                            win32_spawnvp