diff options
| -rw-r--r-- | perly.h | 2 | ||||
| -rw-r--r-- | regen_perly.pl | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -175,7 +175,6 @@ #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 diff --git a/regen_perly.pl b/regen_perly.pl index 95e209bc6c..f3b3f59ce3 100644 --- a/regen_perly.pl +++ b/regen_perly.pl @@ -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; |