X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embedvar.h;h=889b4d44f27e844feaf40f90a2b415f163331a34;hb=be341bcebb03d2f97192fb78a6a1bc33c7bca5ce;hp=e44a2cee2cba9ca15c62b44732cc4cb24a8962e0;hpb=cb50131aab68ac6dda048612c6e853b8cb08701e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embedvar.h b/embedvar.h
index e44a2ce..889b4d4 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -322,6 +322,7 @@
 #define PL_nomemok		(PERL_GET_INTERP->Inomemok)
 #define PL_nthreads		(PERL_GET_INTERP->Inthreads)
 #define PL_nthreads_cond	(PERL_GET_INTERP->Inthreads_cond)
+#define PL_nullstash		(PERL_GET_INTERP->Inullstash)
 #define PL_numeric_local	(PERL_GET_INTERP->Inumeric_local)
 #define PL_numeric_name		(PERL_GET_INTERP->Inumeric_name)
 #define PL_numeric_radix	(PERL_GET_INTERP->Inumeric_radix)
@@ -385,7 +386,6 @@
 #define PL_svref_mutex		(PERL_GET_INTERP->Isvref_mutex)
 #define PL_sys_intern		(PERL_GET_INTERP->Isys_intern)
 #define PL_tainting		(PERL_GET_INTERP->Itainting)
-#define PL_thr_key		(PERL_GET_INTERP->Ithr_key)
 #define PL_threadnum		(PERL_GET_INTERP->Ithreadnum)
 #define PL_threads_mutex	(PERL_GET_INTERP->Ithreads_mutex)
 #define PL_threadsv_names	(PERL_GET_INTERP->Ithreadsv_names)
@@ -587,6 +587,7 @@
 #define PL_nomemok		(vTHX->Inomemok)
 #define PL_nthreads		(vTHX->Inthreads)
 #define PL_nthreads_cond	(vTHX->Inthreads_cond)
+#define PL_nullstash		(vTHX->Inullstash)
 #define PL_numeric_local	(vTHX->Inumeric_local)
 #define PL_numeric_name		(vTHX->Inumeric_name)
 #define PL_numeric_radix	(vTHX->Inumeric_radix)
@@ -650,7 +651,6 @@
 #define PL_svref_mutex		(vTHX->Isvref_mutex)
 #define PL_sys_intern		(vTHX->Isys_intern)
 #define PL_tainting		(vTHX->Itainting)
-#define PL_thr_key		(vTHX->Ithr_key)
 #define PL_threadnum		(vTHX->Ithreadnum)
 #define PL_threads_mutex	(vTHX->Ithreads_mutex)
 #define PL_threadsv_names	(vTHX->Ithreadsv_names)
@@ -989,6 +989,7 @@
 #define PL_nomemok		(aTHXo->interp.Inomemok)
 #define PL_nthreads		(aTHXo->interp.Inthreads)
 #define PL_nthreads_cond	(aTHXo->interp.Inthreads_cond)
+#define PL_nullstash		(aTHXo->interp.Inullstash)
 #define PL_numeric_local	(aTHXo->interp.Inumeric_local)
 #define PL_numeric_name		(aTHXo->interp.Inumeric_name)
 #define PL_numeric_radix	(aTHXo->interp.Inumeric_radix)
@@ -1052,7 +1053,6 @@
 #define PL_svref_mutex		(aTHXo->interp.Isvref_mutex)
 #define PL_sys_intern		(aTHXo->interp.Isys_intern)
 #define PL_tainting		(aTHXo->interp.Itainting)
-#define PL_thr_key		(aTHXo->interp.Ithr_key)
 #define PL_threadnum		(aTHXo->interp.Ithreadnum)
 #define PL_threads_mutex	(aTHXo->interp.Ithreads_mutex)
 #define PL_threadsv_names	(aTHXo->interp.Ithreadsv_names)
@@ -1255,6 +1255,7 @@
 #define PL_Inomemok		PL_nomemok
 #define PL_Inthreads		PL_nthreads
 #define PL_Inthreads_cond	PL_nthreads_cond
+#define PL_Inullstash		PL_nullstash
 #define PL_Inumeric_local	PL_numeric_local
 #define PL_Inumeric_name	PL_numeric_name
 #define PL_Inumeric_radix	PL_numeric_radix
@@ -1318,7 +1319,6 @@
 #define PL_Isvref_mutex		PL_svref_mutex
 #define PL_Isys_intern		PL_sys_intern
 #define PL_Itainting		PL_tainting
-#define PL_Ithr_key		PL_thr_key
 #define PL_Ithreadnum		PL_threadnum
 #define PL_Ithreads_mutex	PL_threads_mutex
 #define PL_Ithreadsv_names	PL_threadsv_names
@@ -1652,7 +1652,9 @@
 #define PL_do_undump		(PL_Vars.Gdo_undump)
 #define PL_hexdigit		(PL_Vars.Ghexdigit)
 #define PL_malloc_mutex		(PL_Vars.Gmalloc_mutex)
+#define PL_op_mutex		(PL_Vars.Gop_mutex)
 #define PL_patleave		(PL_Vars.Gpatleave)
+#define PL_thr_key		(PL_Vars.Gthr_key)
 
 #else /* !PERL_GLOBAL_STRUCT */
 
@@ -1662,11 +1664,13 @@
 #define PL_Gdo_undump		PL_do_undump
 #define PL_Ghexdigit		PL_hexdigit
 #define PL_Gmalloc_mutex	PL_malloc_mutex
+#define PL_Gop_mutex		PL_op_mutex
 #define PL_Gpatleave		PL_patleave
+#define PL_Gthr_key		PL_thr_key
 
 #endif /* PERL_GLOBAL_STRUCT */
 
-#ifdef PERL_POLLUTE		/* disabled by default in 5.006 */
+#ifdef PERL_POLLUTE		/* disabled by default in 5.6.0 */
 
 #define DBsingle		PL_DBsingle
 #define DBsub			PL_DBsub