Filehandle method calls load IO::File on demand

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 65c2e28..61d3f08 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -79,10 +79,8 @@ if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' or $PLATFORM eq "aix") {
 
        $ENV{PERL5LIB} = join $Config{path_sep}, @INC;
        my $cmd = "$^X $opts -V";
-       my $config = `$cmd`;
-       if (! $config) {
-           die "Couldn't run [$cmd]: $!";
-        };
+       my $config = `$cmd`
+           or die "Couldn't run [$cmd]: $!";
        my($options) = $config =~ /^  Compile-time options: (.*?)\n^  \S/ms;
        $options =~ s/\s+/ /g;
        print STDERR "Options: ($options)\n";
@@ -191,11 +189,11 @@ 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.
-    if ($CCTYPE !~ /^MSVC7/ && $CCTYPE !~ /^MSVC8/ && $CCTYPE !~ /^MSVC9/) {
+    if ($CCTYPE =~ /^(?:MSVC60|GCC|BORLAND)$/) {
        print "DESCRIPTION 'Perl interpreter'\n";
     }
     print "EXPORTS\n";
@@ -247,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";
        }
@@ -760,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
@@ -775,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
@@ -795,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
@@ -1220,8 +1221,8 @@ for my $syms (@syms) {
 
 # variables
 
-if ($define{'MULTIPLICITY'}) {
-    for my $f ($perlvars_h, $intrpvar_h) {
+if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) {
+    for my $f ($perlvars_h) {
        my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
        emit_symbols $glob;
     }
@@ -1236,7 +1237,7 @@ else {
        my $glob = readvar($perlvars_h);
        emit_symbols $glob;
     }
-    unless ($define{'MULTIPLICITY'}) {
+    unless ($define{MULTIPLICITY}) {
        my $glob = readvar($intrpvar_h);
        emit_symbols $glob;
     }
@@ -1286,6 +1287,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_open
                            win32_close
                            win32_eof
+                           win32_isatty
                            win32_read
                            win32_write
                            win32_spawnvp