Revert change 26749

[perl5.git] / intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index 7f6d21f..aa0f0c3 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -38,6 +38,7 @@ PERLVAR(Iminus_l,     bool)
 PERLVAR(Iminus_a,      bool)
 PERLVAR(Iminus_F,      bool)
 PERLVAR(Idoswitches,   bool)
+PERLVAR(Iminus_E,      bool)
 
 /*
 =head1 Global Variables
@@ -203,7 +204,7 @@ PERLVAR(Imodglobal, HV *)           /* per-interp module data */
 /* these used to be in global before 5.004_68 */
 PERLVARI(Iprofiledata, U32 *,  NULL)   /* table of ops, counts */
 PERLVARI(Irsfp,        PerlIO * VOL,   Nullfp) /* current source file pointer */
-PERLVARI(Irsfp_filters,        AV *,   Nullav) /* keeps active source filters */
+PERLVARI(Irsfp_filters,        AV *,   NULL)   /* keeps active source filters */
 
 PERLVAR(Icompiling,    COP)            /* compiling/done executing marker */
 
@@ -247,21 +248,8 @@ PERLVAR(Iosname,   char *)         /* operating system */
 
 PERLVAR(Isighandlerp,  Sighandler_t)
 
-PERLVAR(Ixnv_root,     NV *)           /* free xnv list */
-PERLVAR(Ixpv_root,     xpv_allocated *)        /* free xpv list */
-PERLVAR(Ixpviv_root,   xpviv_allocated *)      /* free xpviv list */
-PERLVAR(Ixpvnv_root,   XPVNV *)        /* free xpvnv list */
-PERLVAR(Ixpvcv_root,   XPVCV *)        /* free xpvcv list */
-PERLVAR(Ixpvav_root,   xpvav_allocated *)      /* free xpvav list */
-PERLVAR(Ixpvhv_root,   xpvhv_allocated *)      /* free xpvhv list */
-PERLVAR(Ixpvmg_root,   XPVMG *)        /* free xpvmg list */
-PERLVAR(Ixpvgv_root,   XPVGV *)        /* free xpvgv list */
-PERLVAR(Ixpvlv_root,   XPVLV *)        /* free xpvlv list */
-PERLVAR(Ixpvbm_root,   XPVBM *)        /* free xpvbm list */
-PERLVAR(Ihe_root,      HE *)           /* free he list */
-#if defined(USE_ITHREADS)
-PERLVAR(Ipte_root,     struct ptr_tbl_ent *)   /* free ptr_tbl_ent list */
-#endif
+PERLVARA(Ibody_roots,  SVt_LAST, void*) /* array of body roots */
+
 PERLVAR(Inice_chunk,   char *)         /* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,      U32)    /* how nice the chunk of memory is */
 
@@ -424,23 +412,10 @@ PERLVAR(IProc,            struct IPerlProc*)
 #if defined(USE_ITHREADS)
 PERLVAR(Iptr_table,    PTR_TBL_t*)
 #endif
-PERLVARI(Ibeginav_save, AV*, Nullav)   /* save BEGIN{}s when compiling */
-
-PERLVAR(Ixnv_arenaroot,        XPV*)           /* list of allocated xnv areas */
-PERLVAR(Ixpv_arenaroot,        xpv_allocated *)        /* list of allocated xpv areas */
-PERLVAR(Ixpviv_arenaroot,xpviv_allocated*)     /* list of allocated xpviv areas */
-PERLVAR(Ixpvnv_arenaroot,XPVNV*)       /* list of allocated xpvnv areas */
-PERLVAR(Ixpvcv_arenaroot,XPVCV*)       /* list of allocated xpvcv areas */
-PERLVAR(Ixpvav_arenaroot,xpvav_allocated*)     /* list of allocated xpvav areas */
-PERLVAR(Ixpvhv_arenaroot,xpvhv_allocated*)     /* list of allocated xpvhv areas */
-PERLVAR(Ixpvmg_arenaroot,XPVMG*)       /* list of allocated xpvmg areas */
-PERLVAR(Ixpvgv_arenaroot,XPVGV*)       /* list of allocated xpvgv areas */
-PERLVAR(Ixpvlv_arenaroot,XPVLV*)       /* list of allocated xpvlv areas */
-PERLVAR(Ixpvbm_arenaroot,XPVBM*)       /* list of allocated xpvbm areas */
-PERLVAR(Ihe_arenaroot, HE *)           /* list of allocated he areas */
-#if defined(USE_ITHREADS)
-PERLVAR(Ipte_arenaroot,        struct ptr_tbl_ent *) /* list of allocated pte areas */
-#endif
+PERLVARI(Ibeginav_save, AV*, NULL)     /* save BEGIN{}s when compiling */
+
+PERLVARA(Ibody_arenaroots, SVt_LAST, void*) /* consolidated body-arena pointers */
+
      /* 5.6.0 stopped here */
 
 PERLVAR(Ipsig_pend, int *)             /* per-signal "count" of pending */
@@ -492,7 +467,7 @@ PERLVAR(Iutf8_idcont,       SV *)
 
 PERLVAR(Isort_RealCmp,  SVCOMPARE_t)
 
-PERLVARI(Icheckav_save, AV*, Nullav)   /* save CHECK{}s when compiling */
+PERLVARI(Icheckav_save, AV*, NULL)     /* save CHECK{}s when compiling */
 
 PERLVARI(Iclocktick, long, 0)  /* this many times() ticks in a second */
 
@@ -542,6 +517,12 @@ PERLVARI(Isuidscript, int, -1)     /* fd for suid script */
 /* File descriptor to talk to the child which dumps scalars.  */
 PERLVARI(Idumper_fd, int, -1)
 #endif
+
+#ifdef PERL_IMPLICIT_CONTEXT
+PERLVARI(Imy_cxt_size, int, 0)         /* size of PL_my_cxt_list */
+PERLVARI(Imy_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */
+#endif
+
 /* New variables must be added to the very end, before this comment,
  * for binary compatibility (the offsets of the old members must not change).
  * (Don't forget to add your variable also to perl_clone()!)