[win32] merge change#985 from maintbranch

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

diff --git a/embedvar.h b/embedvar.h
index 1b93609..9df0554 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -29,10 +29,8 @@
 #define curpad                 (curinterp->Tcurpad)
 #define curpm                  (curinterp->Tcurpm)
 #define curstack               (curinterp->Tcurstack)
+#define curstackinfo           (curinterp->Tcurstackinfo)
 #define curstash               (curinterp->Tcurstash)
-#define cxstack                        (curinterp->Tcxstack)
-#define cxstack_ix             (curinterp->Tcxstack_ix)
-#define cxstack_max            (curinterp->Tcxstack_max)
 #define defoutgv               (curinterp->Tdefoutgv)
 #define defstash               (curinterp->Tdefstash)
 #define delaymagic             (curinterp->Tdelaymagic)
@@ -47,6 +45,7 @@
 #define markstack              (curinterp->Tmarkstack)
 #define markstack_max          (curinterp->Tmarkstack_max)
 #define markstack_ptr          (curinterp->Tmarkstack_ptr)
+#define modcount               (curinterp->Tmodcount)
 #define nrs                    (curinterp->Tnrs)
 #define ofs                    (curinterp->Tofs)
 #define ofslen                 (curinterp->Tofslen)
@@ -117,6 +116,8 @@
 #define errgv                  (curinterp->Ierrgv)
 #define eval_root              (curinterp->Ieval_root)
 #define eval_start             (curinterp->Ieval_start)
+#define exitlist               (curinterp->Iexitlist)
+#define exitlistlen            (curinterp->Iexitlistlen)
 #define fdpid                  (curinterp->Ifdpid)
 #define filemode               (curinterp->Ifilemode)
 #define firstgv                        (curinterp->Ifirstgv)
@@ -148,6 +149,7 @@
 #define minus_l                        (curinterp->Iminus_l)
 #define minus_n                        (curinterp->Iminus_n)
 #define minus_p                        (curinterp->Iminus_p)
+#define modglobal              (curinterp->Imodglobal)
 #define multiline              (curinterp->Imultiline)
 #define mystrk                 (curinterp->Imystrk)
 #define ofmt                   (curinterp->Iofmt)
@@ -174,9 +176,7 @@
 #define screamnext             (curinterp->Iscreamnext)
 #define secondgv               (curinterp->Isecondgv)
 #define siggv                  (curinterp->Isiggv)
-#define signalstack            (curinterp->Isignalstack)
 #define sortcop                        (curinterp->Isortcop)
-#define sortstack              (curinterp->Isortstack)
 #define sortstash              (curinterp->Isortstash)
 #define splitstr               (curinterp->Isplitstr)
 #define statcache              (curinterp->Istatcache)
@@ -191,6 +191,7 @@
 #define sv_count               (curinterp->Isv_count)
 #define sv_objcount            (curinterp->Isv_objcount)
 #define sv_root                        (curinterp->Isv_root)
+#define sys_intern             (curinterp->Isys_intern)
 #define tainting               (curinterp->Itainting)
 #define threadnum              (curinterp->Ithreadnum)
 #define thrsv                  (curinterp->Ithrsv)
@@ -235,6 +236,8 @@
 #define Ierrgv                 errgv
 #define Ieval_root             eval_root
 #define Ieval_start            eval_start
+#define Iexitlist              exitlist
+#define Iexitlistlen           exitlistlen
 #define Ifdpid                 fdpid
 #define Ifilemode              filemode
 #define Ifirstgv               firstgv
@@ -266,6 +269,7 @@
 #define Iminus_l               minus_l
 #define Iminus_n               minus_n
 #define Iminus_p               minus_p
+#define Imodglobal             modglobal
 #define Imultiline             multiline
 #define Imystrk                        mystrk
 #define Iofmt                  ofmt
@@ -292,9 +296,7 @@
 #define Iscreamnext            screamnext
 #define Isecondgv              secondgv
 #define Isiggv                 siggv
-#define Isignalstack           signalstack
 #define Isortcop               sortcop
-#define Isortstack             sortstack
 #define Isortstash             sortstash
 #define Isplitstr              splitstr
 #define Istatcache             statcache
@@ -309,6 +311,7 @@
 #define Isv_count              sv_count
 #define Isv_objcount           sv_objcount
 #define Isv_root               sv_root
+#define Isys_intern            sys_intern
 #define Itainting              tainting
 #define Ithreadnum             threadnum
 #define Ithrsv                 thrsv
@@ -326,10 +329,8 @@
 #define Tcurpad                        curpad
 #define Tcurpm                 curpm
 #define Tcurstack              curstack
+#define Tcurstackinfo          curstackinfo
 #define Tcurstash              curstash
-#define Tcxstack               cxstack
-#define Tcxstack_ix            cxstack_ix
-#define Tcxstack_max           cxstack_max
 #define Tdefoutgv              defoutgv
 #define Tdefstash              defstash
 #define Tdelaymagic            delaymagic
@@ -344,6 +345,7 @@
 #define Tmarkstack             markstack
 #define Tmarkstack_max         markstack_max
 #define Tmarkstack_ptr         markstack_ptr
+#define Tmodcount              modcount
 #define Tnrs                   nrs
 #define Tofs                   ofs
 #define Tofslen                        ofslen
@@ -416,6 +418,8 @@
 #define errgv                  Perl_errgv
 #define eval_root              Perl_eval_root
 #define eval_start             Perl_eval_start
+#define exitlist               Perl_exitlist
+#define exitlistlen            Perl_exitlistlen
 #define fdpid                  Perl_fdpid
 #define filemode               Perl_filemode
 #define firstgv                        Perl_firstgv
@@ -447,6 +451,7 @@
 #define minus_l                        Perl_minus_l
 #define minus_n                        Perl_minus_n
 #define minus_p                        Perl_minus_p
+#define modglobal              Perl_modglobal
 #define multiline              Perl_multiline
 #define mystrk                 Perl_mystrk
 #define ofmt                   Perl_ofmt
@@ -473,9 +478,7 @@
 #define screamnext             Perl_screamnext
 #define secondgv               Perl_secondgv
 #define siggv                  Perl_siggv
-#define signalstack            Perl_signalstack
 #define sortcop                        Perl_sortcop
-#define sortstack              Perl_sortstack
 #define sortstash              Perl_sortstash
 #define splitstr               Perl_splitstr
 #define statcache              Perl_statcache
@@ -490,6 +493,7 @@
 #define sv_count               Perl_sv_count
 #define sv_objcount            Perl_sv_objcount
 #define sv_root                        Perl_sv_root
+#define sys_intern             Perl_sys_intern
 #define tainting               Perl_tainting
 #define threadnum              Perl_threadnum
 #define thrsv                  Perl_thrsv
@@ -507,10 +511,8 @@
 #define curpad                 Perl_curpad
 #define curpm                  Perl_curpm
 #define curstack               Perl_curstack
+#define curstackinfo           Perl_curstackinfo
 #define curstash               Perl_curstash
-#define cxstack                        Perl_cxstack
-#define cxstack_ix             Perl_cxstack_ix
-#define cxstack_max            Perl_cxstack_max
 #define defoutgv               Perl_defoutgv
 #define defstash               Perl_defstash
 #define delaymagic             Perl_delaymagic
@@ -525,6 +527,7 @@
 #define markstack              Perl_markstack
 #define markstack_max          Perl_markstack_max
 #define markstack_ptr          Perl_markstack_ptr
+#define modcount               Perl_modcount
 #define nrs                    Perl_nrs
 #define ofs                    Perl_ofs
 #define ofslen                 Perl_ofslen
@@ -572,10 +575,8 @@
 #define curpad                 (thr->Tcurpad)
 #define curpm                  (thr->Tcurpm)
 #define curstack               (thr->Tcurstack)
+#define curstackinfo           (thr->Tcurstackinfo)
 #define curstash               (thr->Tcurstash)
-#define cxstack                        (thr->Tcxstack)
-#define cxstack_ix             (thr->Tcxstack_ix)
-#define cxstack_max            (thr->Tcxstack_max)
 #define defoutgv               (thr->Tdefoutgv)
 #define defstash               (thr->Tdefstash)
 #define delaymagic             (thr->Tdelaymagic)
@@ -590,6 +591,7 @@
 #define markstack              (thr->Tmarkstack)
 #define markstack_max          (thr->Tmarkstack_max)
 #define markstack_ptr          (thr->Tmarkstack_ptr)
+#define modcount               (thr->Tmodcount)
 #define nrs                    (thr->Tnrs)
 #define ofs                    (thr->Tofs)
 #define ofslen                 (thr->Tofslen)