VMS fixage and cleanup

[perl5.git] / thrdvar.h

diff --git a/thrdvar.h b/thrdvar.h
index e4cfacc..b35e735 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -5,16 +5,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,11 +81,27 @@ 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(Tunused_1,     SV *)           /* placeholder: was Tnrs */
+
+/*
+=for apidoc mn|SV*|PL_rs
+
+The input record separator - C<$/> in Perl space.
+
+=for apidoc mn|GV*|PL_last_in_gv
+
+The GV which was last used for a filehandle input operation. (C<< <FH> >>)
+
+=for apidoc mn|SV*|PL_ofs_sv
+
+The output field separator - C<$,> in Perl space.
+
+=cut
+*/
+
 PERLVAR(Trs,           SV *)           /* input record separator $/ */
 PERLVAR(Tlast_in_gv,   GV *)           /* GV used in last <FH> */
-PERLVAR(Tofs,          char *)         /* output field separator $, */
-PERLVAR(Tofslen,       STRLEN)
+PERLVAR(Tofs_sv,       SV *)           /* output field separator $, */
 PERLVAR(Tdefoutgv,     GV *)           /* default FH for output */
 PERLVARI(Tchopset,     char *, " \n-") /* $: */
 PERLVAR(Tformtarget,   SV *)
@@ -166,8 +182,9 @@ PERLVAR(Tregeol,    char *)         /* End of input, for $ check. */
 PERLVAR(Tregstartp,    I32 *)          /* Pointer to startp array. */
 PERLVAR(Tregendp,      I32 *)          /* Ditto for endp. */
 PERLVAR(Treglastparen, U32 *)          /* Similarly for lastparen. */
+PERLVAR(Treglastcloseparen, U32 *)     /* Similarly for lastcloseparen. */
 PERLVAR(Tregtill,      char *)         /* How far we are required to go. */
-PERLVAR(Tregprev,      char)           /* char before regbol, \n if none */
+PERLVAR(Tregcompat1,   char)           /* used to be regprev1 */
 PERLVAR(Treg_start_tmp,        char **)        /* from regexec.c */
 PERLVAR(Treg_start_tmpl,U32)           /* from regexec.c */
 PERLVAR(Tregdata,      struct reg_data *)
@@ -194,6 +211,8 @@ PERLVAR(Treg_leftiter,      I32)            /* wait until caching pos */
 PERLVARI(Treg_poscache, char *, Nullch)        /* cache of pos of WHILEM */
 PERLVAR(Treg_poscache_size, STRLEN)    /* size of pos cache of WHILEM */
 
+PERLVARI(Tpeepp,       peep_t, MEMBER_TO_FPTR(Perl_peep))
+                                       /* Pointer to peephole optimizer */
 PERLVARI(Tregcompp,    regcomp_t, MEMBER_TO_FPTR(Perl_pregcomp))
                                        /* Pointer to REx compiler */
 PERLVARI(Tregexecp,    regexec_t, MEMBER_TO_FPTR(Perl_regexec_flags))
@@ -214,7 +233,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 *)
@@ -236,5 +255,9 @@ PERLVAR(i,          struct thread_intern)
 #endif
 
 PERLVAR(trailing_nul,  char)           /* For the sake of thrsv and oursv */
+PERLVAR(thr_done,      bool)           /* True when the thread has finished */
+
+#endif /* USE_5005THREADS */
+
+PERLVAR(Treg_match_utf8,       bool)           /* was what we matched against utf8 */
 
-#endif /* USE_THREADS */