From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 18 Nov 2008 20:32:23 +0000 (+0000)
Subject: Rename PL_breakable_sub_generation to PL_breakable_sub_gen, to please
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fd06b02ce1aae5ae555b7101c2fe3e521cb2fd9f;p=p5sagit%2Fp5-mst-13.2.git

Rename PL_breakable_sub_generation to PL_breakable_sub_gen, to please
the ANSI gods of VMS.

p4raw-id: //depot/perl@34886
---

diff --git a/embedvar.h b/embedvar.h
index 9b05dd6..0502d00 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -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
diff --git a/intrpvar.h b/intrpvar.h
index ac50f84..5e684b9 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -677,7 +677,8 @@ PERLVARI(Idestroyhook, destroyable_proc_t, MEMBER_TO_FPTR(Perl_sv_destroyable))
 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.  */
diff --git a/op.c b/op.c
index 11e940b..b679835 100644
--- a/op.c
+++ b/op.c
@@ -5802,7 +5802,7 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
        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));
diff --git a/perlapi.h b/perlapi.h
index ce540c8..3eb7124 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -186,8 +186,8 @@ END_EXTERN_C
 #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
diff --git a/pp_ctl.c b/pp_ctl.c
index f555776..8e89cb9 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3653,7 +3653,7 @@ PP(pp_entereval)
     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 @@ PP(pp_entereval)
     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