Re: [perl #32687] Encode::is_utf8 on tainted UTF8 string

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

diff --git a/thrdvar.h b/thrdvar.h
index 1b68a87..61298ed 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -1,6 +1,7 @@
 /*    thdrvar.h
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others
+ *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ *    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.
@@ -118,8 +119,8 @@ PERLVAR(Tcurstash,  HV *)           /* symbol table for current package */
 
 PERLVAR(Trestartop,    OP *)           /* propagating an error from croak? */
 PERLVARI(Tcurcop,      COP * VOL,      &PL_compiling)
-PERLVAR(Tin_eval,      VOL int)        /* trap "fatal" errors? */
-PERLVAR(Tdelaymagic,   int)            /* ($<,$>) = ... */
+PERLVAR(Tin_eval,      VOL U8) /* trap "fatal" errors? */
+PERLVAR(Tdelaymagic,   U16)            /* ($<,$>) = ... */
 PERLVARI(Tdirty,       bool, FALSE)    /* in the middle of tearing things down? */
 PERLVAR(Tlocalizing,   int)            /* are we processing a local() list? */
 
@@ -165,16 +166,6 @@ PERLVARA(Tcolors,6,        char *)         /* from regcomp.c */
 
 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))
-                                       /* Pointer to REx executer */
-PERLVARI(Tregint_start,        re_intuit_start_t, MEMBER_TO_FPTR(Perl_re_intuit_start))
-                                       /* Pointer to optimized REx executer */
-PERLVARI(Tregint_string,re_intuit_string_t, MEMBER_TO_FPTR(Perl_re_intuit_string))
-                                       /* Pointer to optimized REx 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(Twatchaddr,   char **,    0)