[win32] merge changes#1014,1038 from maintbranch

[p5sagit/p5-mst-13.2.git] / intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index f3014cb..a1ec59b 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -31,8 +31,7 @@ PERLVAR(Isawstudy,    bool)           /* do fbm_instr on all strings */
 PERLVAR(Isawvec,       bool)           
 PERLVAR(Iunsafe,       bool)           
 PERLVAR(Iinplace,      char *)         
-PERLVAR(Ie_tmpname,    char *)         
-PERLVAR(Ie_fp,         PerlIO *)               
+PERLVAR(Ie_script,     SV *)           
 PERLVAR(Iperldb,       U32)            
 
 /* This value may be raised by extensions for testing purposes */
@@ -138,8 +137,6 @@ PERLVAR(Isortcop,   OP *)           /* user defined sort routine */
 PERLVAR(Isortstash,    HV *)           /* which is in some package or other */
 PERLVAR(Ifirstgv,      GV *)           /* $a */
 PERLVAR(Isecondgv,     GV *)           /* $b */
-PERLVAR(Isortstack,    AV *)           /* temp stack during pp_sort() */
-PERLVAR(Isignalstack,  AV *)           /* temp stack during sighandler() */
 PERLVAR(Imystrk,       SV *)           /* temp key string for do_each() */
 PERLVAR(Idumplvl,      I32)            /* indentation level on syntax tree dump */
 PERLVAR(Ioldlastpm,    PMOP *)         /* for saving regexp context during debugger */
@@ -154,6 +151,16 @@ PERLVAR(Iors,              char *)         /* $\ */
 PERLVAR(Iorslen,       STRLEN)         
 PERLVAR(Iofmt,         char *)         /* $# */
 
+/* interpreter atexit processing */
+PERLVARI(Iexitlist,    PerlExitListEntry *, NULL)      /* list of exit functions */
+PERLVARI(Iexitlistlen, I32, 0)                         /* length of same */
+PERLVAR(Imodglobal,    HV *)                           /* per-interp module data */
+
+#ifdef HAVE_INTERP_INTERN
+PERLVAR(Isys_intern,   struct interp_intern)           /* platform internals */
+#endif
+
 #ifdef USE_THREADS
 PERLVAR(Ithrsv,                SV *)           /* holds struct perl_thread for main thread */
+PERLVARI(Ithreadnum,   U32,    0)      /* incremented each thread creation */
 #endif /* USE_THREADS */