Integrate mainline

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

diff --git a/thrdvar.h b/thrdvar.h
index 8e999fc..0abd69f 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -1,3 +1,16 @@
+/*    thdrvar.h
+ *
+ *    Copyright (c) 1997-2002, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
+/*
+=head1 Global Variables
+*/
+
 /***********************************************/
 /* Global only to current thread               */
 /***********************************************/
@@ -5,16 +18,16 @@
 /* Don't forget to re-run embed.pl to propagate changes! */
 
 /* The 'T' prefix is only needed for vars that need appropriate #defines
- * generated when built with or without USE_THREADS.  It is also used
+ * generated when built with or without USE_5005THREADS.  It is also used
  * to generate the appropriate export list for win32.
  *
- * When building without USE_THREADS, these variables will be truly global.
- * When building without USE_THREADS but with MULTIPLICITY, these variables
+ * When building without USE_5005THREADS, these variables will be truly global.
+ * When building without USE_5005THREADS but with MULTIPLICITY, these variables
  * will be global per-interpreter. */
 
 /* Important ones in the first cache line (if alignment is done right) */
 
-#ifdef USE_THREADS
+#ifdef USE_5005THREADS
 PERLVAR(interp,                PerlInterpreter*)       /* thread owner */
 #endif
 
@@ -81,7 +94,7 @@ PERLVAR(Ttimesbuf,    struct tms)
 /* Fields used by magic variables such as $@, $/ and so on */
 PERLVAR(Ttainted,      bool)           /* using variables controlled by $< */
 PERLVAR(Tcurpm,                PMOP *)         /* what to do \ interps in REs from */
-PERLVAR(Tnrs,          SV *)
+PERLVAR(Tnrs,          SV *)           /* placeholder: unused since 5.8.0 (5.7.2 patch #12027 for bug ID 20010815.012) */
 
 /*
 =for apidoc mn|SV*|PL_rs
@@ -233,7 +246,7 @@ PERLVAR(Twatchok,   char *)
 /* Note that the variables below are all explicitly referenced in the code
  * as thr->whatever and therefore don't need the 'T' prefix. */
 
-#ifdef USE_THREADS
+#ifdef USE_5005THREADS
 
 PERLVAR(oursv,         SV *)
 PERLVAR(cvcache,       HV *)
@@ -256,4 +269,8 @@ PERLVAR(i,          struct thread_intern)
 
 PERLVAR(trailing_nul,  char)           /* For the sake of thrsv and oursv */
 PERLVAR(thr_done,      bool)           /* True when the thread has finished */
-#endif /* USE_THREADS */
+
+#endif /* USE_5005THREADS */
+
+PERLVAR(Treg_match_utf8,       bool)           /* was what we matched against utf8 */
+