I think that "merge Perl_sv_2[inpu]v" and "reduce duplication in

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

diff --git a/thrdvar.h b/thrdvar.h
index ede3cc1..2745470 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.
@@ -56,10 +56,6 @@ PERLVAR(Tmarkstack,  I32 *)          /* stack_sp locations we're remembering */
 PERLVAR(Tmarkstack_ptr,        I32 *)
 PERLVAR(Tmarkstack_max,        I32 *)
 
-PERLVAR(Tretstack,     OP **)          /* XXX for 5.8.x BINCOMPAT */
-PERLVAR(Tretstack_ix,  I32)            /* XXX for 5.8.x BINCOMPAT */
-PERLVAR(Tretstack_max, I32)            /* XXX for 5.8.x BINCOMPAT */
-
 PERLVAR(TSv,           SV *)           /* used to hold temporary values */
 PERLVAR(TXpv,          XPV *)          /* used to hold temporary values */
 
@@ -81,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)
@@ -112,7 +108,7 @@ PERLVAR(Trs,                SV *)           /* input record separator $/ */
 PERLVAR(Tlast_in_gv,   GV *)           /* GV used in last <FH> */
 PERLVAR(Tofs_sv,       SV *)           /* output field separator $, */
 PERLVAR(Tdefoutgv,     GV *)           /* default FH for output */
-PERLVARI(Tchopset,     char *, " \n-") /* $: */
+PERLVARI(Tchopset,     const char *,   " \n-") /* $: */
 PERLVAR(Tformtarget,   SV *)
 PERLVAR(Tbodytarget,   SV *)
 PERLVAR(Ttoptarget,    SV *)
@@ -134,10 +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 */
-#ifdef PERL_FLEXIBLE_EXCEPTIONS
-PERLVARI(Tprotect,     protect_proc_t, MEMBER_TO_FPTR(Perl_default_protect))
-#endif
-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 */
@@ -154,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*)
@@ -204,7 +196,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))
@@ -220,8 +212,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 *)