Change 28593 by [EMAIL PROTECTED] on 2006/07/17 14:23:59
Avoid an error that VC++'s resource compiler seems to have
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
Affected files ...
... //depot/perl/perly.h#27 edit
... //depot/perl/regen_perly.pl#9 edit
Differences ...
==== //depot/perl/perly.h#27 (text) ====
Index: perl/perly.h
--- perl/perly.h#26~28314~ 2006-05-26 11:50:34.000000000 -0700
+++ perl/perly.h 2006-07-17 07:23:59.000000000 -0700
@@ -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 @@
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
==== //depot/perl/regen_perly.pl#9 (text) ====
Index: perl/regen_perly.pl
--- perl/regen_perly.pl#8~28315~ 2006-05-26 17:31:33.000000000 -0700
+++ perl/regen_perly.pl 2006-07-17 07:23:59.000000000 -0700
@@ -105,7 +105,8 @@
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 @@
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;
End of Patch.
