Revert change 26749

[perl5.git] / intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index 1612b9f..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 */
 
@@ -249,11 +250,6 @@ PERLVAR(Isighandlerp,      Sighandler_t)
 
 PERLVARA(Ibody_roots,  SVt_LAST, void*) /* array of body roots */
 
-PERLVAR(Ihe_root,      HE *)           /* free he list */
-
-#if defined(USE_ITHREADS)
-PERLVAR(Ipte_root,     struct ptr_tbl_ent *)   /* free ptr_tbl_ent list */
-#endif
 PERLVAR(Inice_chunk,   char *)         /* a nice chunk of memory to reuse */
 PERLVAR(Inice_chunk_size,      U32)    /* how nice the chunk of memory is */
 
@@ -416,16 +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 */
+PERLVARI(Ibeginav_save, AV*, NULL)     /* save BEGIN{}s when compiling */
 
 PERLVARA(Ibody_arenaroots, SVt_LAST, void*) /* consolidated body-arena pointers */
 
-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
-
      /* 5.6.0 stopped here */
 
 PERLVAR(Ipsig_pend, int *)             /* per-signal "count" of pending */
@@ -477,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 */
 
@@ -527,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()!)