Upgrade perlfaq from version 5.20180605 to 5.0180915.

[perl5.git] / Porting / expand-macro.pl

diff --git a/Porting/expand-macro.pl b/Porting/expand-macro.pl
index 772bff6..cf2c9c8 100755 (executable)
--- a/Porting/expand-macro.pl
+++ b/Porting/expand-macro.pl
@@ -51,11 +51,20 @@ while (<>) {
 }
 die "$macro not found\n" unless defined $header;
 
+if ($^O =~ /MSWin(32|64)/) {
+    # The Win32 (and Win64) build process expects to be run from
+    # bleadperl/Win32
+    chdir "Win32"
+       or die "Couldn't chdir to win32: $!";
+};
+
 open my $out, '>', $trysource or die "Can't open $trysource: $!";
 
 my $sentinel = "$macro expands to";
 
-my %done_header;
+# These two are included from perl.h, and perl.h sometimes redefines their
+# macros. So no need to include them.
+my %done_header = ('embed.h' => 1, 'embedvar.h' => 1);
 
 sub do_header {
     my $header = shift;
@@ -107,15 +116,17 @@ if ($opt{f} || $opt{F}) {
     $out_fh = \*STDOUT;
 }
 
-open my $fh, '<', $tryout or die "Can't open $tryout: $!";
+{
+    open my $fh, '<', $tryout or die "Can't open $tryout: $!";
 
-while (<$fh>) {
-    print $out_fh $_ if /$sentinel/o .. 1;
-}
+    while (<$fh>) {
+       print $out_fh $_ if /$sentinel/o .. 1;
+    }
+};
 
 unless ($opt{k}) {
     foreach($trysource, $tryout) {
-       die "Can't unlink $_" unless unlink $_;
+       die "Can't unlink $_: $!" unless unlink $_;
     }
 }
 
@@ -127,12 +138,14 @@ expand-macro.pl - expand C macros using the C preprocessor
 
 =head1 SYNOPSIS
 
-  expand-macro.pl [options] [ < macro-name | macro-expression | - > [headers] ]
+  expand-macro.pl [options]
+                  [ < macro-name | macro-expression | - > [headers] ]
 
   options:
     -f         use 'indent' to format output
     -F <tool>  use <tool> to format output  (instead of -f)
-    -e         erase try.[ic] instead of failing when they're present (errdetect)
+    -e         erase try.[ic] instead of failing when they're present
+                (errdetect)
     -k         keep them after generating (for handy inspection)
     -v         verbose
     -I <indent-opts>   passed into indent