X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlvars.h;h=55769d55ca0a2a65112b53cbdec898517c072be6;hb=191f2cf3f90fff5e4eb7a8663a83ed6c7031cf5d;hp=c1a0dd41cc61b6821154c0579e89bc302f5078c8;hpb=0672f40ebb7f0cdf6045545c3680ba955a0cd920;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlvars.h b/perlvars.h
index c1a0dd4..55769d5 100644
--- a/perlvars.h
+++ b/perlvars.h
@@ -19,34 +19,18 @@
 
 /* global state */
 PERLVAR(Gcurinterp,	PerlInterpreter *)
-					/* currently running interpreter */
-#ifdef USE_THREADS
-PERLVAR(Gthr_key,	perl_key)	/* For per-thread struct perl_thread* */
-PERLVAR(Gsv_mutex,	perl_mutex)	/* Mutex for allocating SVs in sv.c */
-PERLVAR(Gmalloc_mutex,	perl_mutex)	/* Mutex for malloc */
-PERLVAR(Geval_mutex,	perl_mutex)	/* Mutex for doeval */
-PERLVAR(Geval_cond,	perl_cond)	/* Condition variable for doeval */
-PERLVAR(Geval_owner,	struct perl_thread *)
-					/* Owner thread for doeval */
-PERLVAR(Gnthreads,	int)		/* Number of threads currently */
-PERLVAR(Gthreads_mutex,	perl_mutex)	/* Mutex for nthreads and thread list */
-PERLVAR(Gnthreads_cond,	perl_cond)	/* Condition variable for nthreads */
-PERLVAR(Gsvref_mutex,	perl_mutex)	/* Mutex for SvREFCNT_{inc,dec} */
-PERLVARI(Gthreadsv_names,char *,	THREADSV_NAMES)
-#ifdef FAKE_THREADS
-PERLVAR(Gcurthr,	struct perl_thread *)
-					/* Currently executing (fake) thread */
-#endif
-
-PERLVAR(Gcred_mutex,	perl_mutex)	/* altered credentials in effect */
-
-#endif /* USE_THREADS */
-
-PERLVAR(Gninterps,	int)		/* number of active interpreters */
-PERLVARI(Gdo_undump,	bool,	FALSE)	/* -u or dump seen? */
+					/* currently running interpreter
+					 * XXX this needs to be in TLS */
 
 /* constants (these are not literals to facilitate pointer comparisons) */
 PERLVARIC(GYes,		char *, "1")
 PERLVARIC(GNo,		char *, "")
 PERLVARIC(Ghexdigit,	char *, "0123456789abcdef0123456789ABCDEF")
 PERLVARIC(Gpatleave,	char *, "\\.^$@dDwWsSbB+*?|()-nrtfeaxc0123456789[{]}")
+
+/* XXX does anyone even use this? */
+PERLVARI(Gdo_undump,	bool,	FALSE)	/* -u or dump seen? */
+
+#if defined(MYMALLOC) && (defined(USE_THREADS) || defined(USE_ITHREADS))
+PERLVAR(Gmalloc_mutex,	perl_mutex)	/* Mutex for malloc */
+#endif