Teach bisect-runner.pl that on HP-UX, _filbuf() is named __filbuf().

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index bcfed24..ae3b510 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -87,9 +87,12 @@ process_cc_flags(@Config{qw(ccflags optimize)})
 # the user might have chosen to disable because the canned configs are
 # minimal configs that don't include any of those options.
 
-my @options = sort(Config::bincompat_options(), Config::non_bincompat_options());
-print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test';
-$define{$_} = 1 foreach @options;
+#don't use the host Perl's -V defines for the WinCE Perl
+if($ARGS{PLATFORM} ne 'wince') {
+    my @options = sort(Config::bincompat_options(), Config::non_bincompat_options());
+    print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test';
+    $define{$_} = 1 foreach @options;
+}
 
 my %exportperlmalloc =
     (
@@ -101,7 +104,8 @@ my %exportperlmalloc =
 
 my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2';
 
-open(CFG, '<', 'config.h') || die "Cannot open config.h: $!\n";
+my $config_h = $ARGS{PLATFORM} eq 'wince' ? 'xconfig.h' : 'config.h';
+open(CFG, '<', $config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
     $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY
                                            |SPRINTF_RETURNS_STRLEN
@@ -623,7 +627,7 @@ if ($ARGS{PLATFORM} eq 'netware') {
 }
 
 if ($define{'USE_PERLIO'}) {
-    # Export the symols that make up the PerlIO abstraction, regardless
+    # Export the symbols that make up the PerlIO abstraction, regardless
     # of its implementation - read from a file
     push @syms, 'perlio.sym';
 
@@ -751,7 +755,8 @@ if ($define{'USE_PERLIO'}) {
            # within the block, as the *first* definition may have flags which
            # mean "don't export"
            next if $seen{$func}++;
-           $func = "Perl_$func" if $flags =~ /[pbX]/;
+           # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ?
+           $func = "Perl_$func" if ($flags =~ /[pbX]/ && $func !~ /^Perl_/); 
            ++$export{$func} unless exists $skip{$func};
        }
     }
@@ -811,6 +816,10 @@ if ($ARGS{PLATFORM} eq 'win32') {
                 ));
 }
 
+if ($ARGS{PLATFORM} eq 'wince') {
+    ++$skip{'win32_isatty'}; # commit 4342f4d6df is win32-only
+}
+
 if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
     try_symbols(qw(
                            Perl_init_os_extras