This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Avoid an error that VC++'s resource compiler seems to have
authorSteve Hay <SteveHay@planit.com>
Mon, 17 Jul 2006 14:23:59 +0000 (14:23 +0000)
committerSteve Hay <SteveHay@planit.com>
Mon, 17 Jul 2006 14:23:59 +0000 (14:23 +0000)
with a reference to "perly.y" in "perly.h"

See the thread here for details:
http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2006-07/msg00460.html

p4raw-id: //depot/perl@28593

perly.h
regen_perly.pl

diff --git a/perly.h b/perly.h
index c5b5494..38bad2a 100644 (file)
--- a/perly.h
+++ b/perly.h
 
 #endif /* PERL_CORE */
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 30 "perly.y"
 typedef union YYSTYPE {
     I32        ival;
     char *pval;
@@ -186,7 +185,6 @@ typedef union YYSTYPE {
     GV *gvval;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 188 "perly.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
index 95e209b..f3b3f59 100644 (file)
@@ -105,7 +105,8 @@ chmod 0444, $tab_file;
 unlink $tmpc_file;
 
 # Wrap PERL_CORE round the symbol definitions. Also,  the
-# C<#line 123 "perlytmp.h"> gets picked up by make depend, so change it.
+# C<#line 30 "perly.y"> confuses the Win32 resource compiler and the
+# C<#line 188 "perlytmp.h"> gets picked up by make depend, so remove them.
 
 open TMPH_FILE, $tmph_file or die "Can't open $tmph_file: $!\n";
 chmod 0644, $h_file;
@@ -117,7 +118,7 @@ while (<TMPH_FILE>) {
        print H_FILE "#endif /* PERL_CORE */\n";
        $endcore_done = 1;
     }
-    s/"$tmph_file"/"$h_file"/;
+    next if /^#line \d+ ".*"/;
     print H_FILE $_;
 }
 close TMPH_FILE;