Change 34886 by [EMAIL PROTECTED] on 2008/11/18 20:32:23
Rename PL_breakable_sub_generation to PL_breakable_sub_gen, to please
the ANSI gods of VMS.
Affected files ...
... //depot/perl/embedvar.h#269 edit
... //depot/perl/intrpvar.h#239 edit
... //depot/perl/op.c#1022 edit
... //depot/perl/perlapi.h#191 edit
... //depot/perl/pp_ctl.c#716 edit
Differences ...
==== //depot/perl/embedvar.h#269 (text+w) ====
Index: perl/embedvar.h
--- perl/embedvar.h#268~34873~ 2008-11-17 14:04:56.000000000 -0800
+++ perl/embedvar.h 2008-11-18 12:32:23.000000000 -0800
@@ -75,7 +75,7 @@
#define PL_body_arenas (vTHX->Ibody_arenas)
#define PL_body_roots (vTHX->Ibody_roots)
#define PL_bodytarget (vTHX->Ibodytarget)
-#define PL_breakable_sub_generation (vTHX->Ibreakable_sub_generation)
+#define PL_breakable_sub_gen (vTHX->Ibreakable_sub_gen)
#define PL_checkav (vTHX->Icheckav)
#define PL_checkav_save (vTHX->Icheckav_save)
#define PL_chopset (vTHX->Ichopset)
@@ -388,7 +388,7 @@
#define PL_Ibody_arenas PL_body_arenas
#define PL_Ibody_roots PL_body_roots
#define PL_Ibodytarget PL_bodytarget
-#define PL_Ibreakable_sub_generation PL_breakable_sub_generation
+#define PL_Ibreakable_sub_gen PL_breakable_sub_gen
#define PL_Icheckav PL_checkav
#define PL_Icheckav_save PL_checkav_save
#define PL_Ichopset PL_chopset
==== //depot/perl/intrpvar.h#239 (text) ====
Index: perl/intrpvar.h
--- perl/intrpvar.h#238~34873~ 2008-11-17 14:04:56.000000000 -0800
+++ perl/intrpvar.h 2008-11-18 12:32:23.000000000 -0800
@@ -677,7 +677,8 @@
PERLVARI(Isv_serial, U32, 0) /* SV serial number, used in sv.c */
#endif
-PERLVARI(Ibreakable_sub_generation, U32, 0)
+/* Perl_Ibreakable_sub_generation_ptr was too long for VMS, hence "gen" */
+PERLVARI(Ibreakable_sub_gen, U32, 0)
/* If you are adding a U8 or U16, check to see if there are 'Space' comments
* above on where there are gaps which currently will be structure padding. */
==== //depot/perl/op.c#1022 (text) ====
Index: perl/op.c
--- perl/op.c#1021~34873~ 2008-11-17 14:04:56.000000000 -0800
+++ perl/op.c 2008-11-18 12:32:23.000000000 -0800
@@ -5802,7 +5802,7 @@
pp_entereval that it should not throw away any saved lines at scope
exit. */
- PL_breakable_sub_generation++;
+ PL_breakable_sub_gen++;
if (CvLVALUE(cv)) {
CvROOT(cv) = newUNOP(OP_LEAVESUBLV, 0,
mod(scalarseq(block), OP_LEAVESUBLV));
==== //depot/perl/perlapi.h#191 (text+w) ====
Index: perl/perlapi.h
--- perl/perlapi.h#190~34873~ 2008-11-17 14:04:56.000000000 -0800
+++ perl/perlapi.h 2008-11-18 12:32:23.000000000 -0800
@@ -186,8 +186,8 @@
#define PL_body_roots (*Perl_Ibody_roots_ptr(aTHX))
#undef PL_bodytarget
#define PL_bodytarget (*Perl_Ibodytarget_ptr(aTHX))
-#undef PL_breakable_sub_generation
-#define PL_breakable_sub_generation
(*Perl_Ibreakable_sub_generation_ptr(aTHX))
+#undef PL_breakable_sub_gen
+#define PL_breakable_sub_gen (*Perl_Ibreakable_sub_gen_ptr(aTHX))
#undef PL_checkav
#define PL_checkav (*Perl_Icheckav_ptr(aTHX))
#undef PL_checkav_save
==== //depot/perl/pp_ctl.c#716 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#715~34880~ 2008-11-18 03:12:56.000000000 -0800
+++ perl/pp_ctl.c 2008-11-18 12:32:23.000000000 -0800
@@ -3653,7 +3653,7 @@
register PERL_CONTEXT *cx;
SV *sv;
const I32 gimme = GIMME_V;
- const U32 was = PL_breakable_sub_generation;
+ const U32 was = PL_breakable_sub_gen;
char tbuf[TYPE_DIGITS(long) + 12];
char *tmpbuf = tbuf;
char *safestr;
@@ -3731,7 +3731,7 @@
PUTBACK;
ok = doeval(gimme, NULL, runcv, seq);
if ((PERLDB_LINE || PERLDB_SAVESRC)
- && was != PL_breakable_sub_generation /* Some subs defined here. */
+ && was != PL_breakable_sub_gen /* Some subs defined here. */
&& ok) {
/* Just need to change the string in our writable scratch buffer that
will be used at scope exit to delete this eval's "file" name, to
End of Patch.
