Simplify tests for fork() capabilities

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

diff --git a/thrdvar.h b/thrdvar.h
index 00786f7..c626f5f 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -1,6 +1,6 @@
 /*    thdrvar.h
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, by Larry Wall and others
+ *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -77,7 +77,7 @@ PERLVAR(Tna,          STRLEN)         /* for use in SvPV when length is
 PERLVAR(Tstatbuf,      Stat_t)
 PERLVAR(Tstatcache,    Stat_t)         /* _ */
 PERLVAR(Tstatgv,       GV *)
-PERLVARI(Tstatname,    SV *,   Nullsv)
+PERLVARI(Tstatname,    SV *,   NULL)
 
 #ifdef HAS_TIMES
 PERLVAR(Ttimesbuf,     struct tms)
@@ -130,7 +130,7 @@ PERLVAR(Tmainstack, AV *)           /* the stack when nothing funny is happening */
 
 PERLVAR(Ttop_env,      JMPENV *)       /* ptr. to current sigjmp() environment */
 PERLVAR(Tstart_env,    JMPENV)         /* empty startup sigjmp() environment */
-PERLVARI(Terrors,      SV *, Nullsv)   /* outstanding queued errors */
+PERLVARI(Terrors,      SV *, NULL)     /* outstanding queued errors */
 
 /* statics "owned" by various functions */
 PERLVAR(Tav_fetch_sv,  SV *)           /* unused as of change #19268 */
@@ -147,7 +147,6 @@ PERLVAR(Tsortcop,   OP *)           /* user defined sort routine */
 PERLVAR(Tsortstash,    HV *)           /* which is in some package or other */
 PERLVAR(Tfirstgv,      GV *)           /* $a */
 PERLVAR(Tsecondgv,     GV *)           /* $b */
-PERLVAR(Tsortcxix,     I32)            /* from pp_ctl.c */
 
 /* float buffer */
 PERLVAR(Tefloatbuf,    char*)
@@ -161,8 +160,6 @@ PERLVARI(Tmaxscream,        I32,    -1)
 PERLVAR(Tlastscream,   SV *)
 
 PERLVAR(Tregdummy,     regnode)        /* from regcomp.c */
-PERLVAR(Tregprecomp,   char *)         /* uncompiled string. */
-PERLVAR(Tregnpar,      I32)            /* () count. */
 PERLVAR(Tregsize,      I32)            /* Code size. */
 PERLVAR(Tcolorset,     int)            /* from regcomp.c */
 PERLVARA(Tcolors,6,    char *)         /* from regcomp.c */
@@ -176,15 +173,12 @@ PERLVAR(Treglastcloseparen, U32 *)        /* Similarly for lastcloseparen. */
 PERLVAR(Tregtill,      char *)         /* How far we are required to go. */
 PERLVAR(Treg_start_tmp,        char **)        /* from regexec.c */
 PERLVAR(Treg_start_tmpl,U32)           /* from regexec.c */
-PERLVAR(Tregdata,      struct reg_data *)
                                        /* from regexec.c renamed was data */
 PERLVAR(Tbostr,                char *)         /* from regexec.c */
 PERLVAR(Treg_flags,    U32)            /* from regexec.c */
 PERLVAR(Treg_eval_set, I32)            /* from regexec.c */
 PERLVAR(Tregnarrate,   I32)            /* from regexec.c */
-PERLVAR(Tregprogram,   regnode *)      /* from regexec.c */
 PERLVARI(Tregindent,   int,        0)  /* from regexec.c */
-PERLVAR(Tregcc,                CURCUR *)       /* from regexec.c */
 PERLVAR(Treg_call_cc,  struct re_cc_state *)   /* from regexec.c */
 PERLVAR(Treg_re,       regexp *)       /* from regexec.c */
 PERLVAR(Treg_ganch,    char *)         /* position of \G */
@@ -197,7 +191,7 @@ PERLVAR(Treg_oldsaved,      char*)          /* old saved substr during match */
 PERLVAR(Treg_oldsavedlen, STRLEN)      /* old length of saved substr during match */
 PERLVAR(Treg_maxiter,  I32)            /* max wait until caching pos */
 PERLVAR(Treg_leftiter, I32)            /* wait until caching pos */
-PERLVARI(Treg_poscache, char *, Nullch)        /* cache of pos of WHILEM */
+PERLVARI(Treg_poscache, char *, NULL)  /* 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))
@@ -213,8 +207,7 @@ PERLVARI(Tregint_string,re_intuit_string_t, MEMBER_TO_FPTR(Perl_re_intuit_string
 PERLVARI(Tregfree,     regfree_t, MEMBER_TO_FPTR(Perl_pregfree))
                                        /* Pointer to REx free()er */
 
-PERLVARI(Treginterp_cnt,int,       0)  /* Whether `Regexp'
-                                                  was interpolated. */
+PERLVARI(Treginterp_cnt,int,       0)  /* Whether "Regexp" was interpolated. */
 PERLVARI(Treg_starttry,        char *,     0)  /* -Dr: where regtry was called. */
 PERLVARI(Twatchaddr,   char **,    0)
 PERLVAR(Twatchok,      char *)
@@ -224,3 +217,8 @@ PERLVAR(Twatchok,   char *)
 
 PERLVAR(Treg_match_utf8,       bool)           /* was what we matched against utf8 */
 
+/* the currently active slab in a chain of slabs of regmatch states,
+ * and the currently active state within that slab */
+
+PERLVARI(Tregmatch_slab,       regmatch_slab *, NULL)
+PERLVAR(Tregmatch_state,       regmatch_state *)