subroutine redefinitions made with local() shouldn't warn

[perl5.git] / intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index f16d6dd..d076446 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -36,7 +36,7 @@ PERLVAR(I, stack_base,        SV **)
 PERLVAR(I, stack_max,  SV **)
 
 PERLVAR(I, savestack,  ANY *)          /* items that need to be restored when
-                                          LEAVEing scopes we've ENTERed */
+                                           LEAVEing scopes we've ENTERed */
 PERLVAR(I, savestack_ix, I32)
 PERLVAR(I, savestack_max, I32)
 
@@ -50,7 +50,7 @@ PERLVARI(I, tmps_floor,       SSize_t,        -1)
 PERLVAR(I, tmps_max,   SSize_t)        /* first unalloced slot in tmps stack */
 
 PERLVAR(I, markstack,  I32 *)          /* stack_sp locations we're
-                                          remembering */
+                                           remembering */
 PERLVAR(I, markstack_ptr, I32 *)
 PERLVAR(I, markstack_max, I32 *)
 
@@ -163,7 +163,7 @@ PERLVAR(I, curcop,  COP *)
 PERLVAR(I, curstack,   AV *)           /* THE STACK */
 PERLVAR(I, curstackinfo, PERL_SI *)    /* current stack + context */
 PERLVAR(I, mainstack,  AV *)           /* the stack when nothing funny is
-                                          happening */
+                                           happening */
 
 /* memory management */
 PERLVAR(I, sv_count,   IV)             /* how many SV* are currently allocated */
@@ -225,8 +225,8 @@ PERLVAR(I, padname_const,   PADNAME)
 
 A scratch pad SV for whatever temporary use you need.  Chiefly used as a
 fallback by macros on platforms where L<perlapi/PERL_USE_GCC_BRACE_GROUPS>> is
-unavailable, and which would otherwise would evaluate their SV parameter more
-than once.
+unavailable, and which would otherwise evaluate their SV parameter more than
+once.
 
 =cut
 */
@@ -249,7 +249,7 @@ C<SvPV_nolen> macro.
 */
 
 PERLVAR(I, na,         STRLEN)         /* for use in SvPV when length is
-                                          Not Applicable */
+                                           Not Applicable */
 
 /* stat stuff */
 PERLVAR(I, statcache,  Stat_t)         /* _ */
@@ -318,7 +318,7 @@ PERLVAR(I, efloatbuf,       char *)
 PERLVAR(I, efloatsize, STRLEN)
 
 PERLVARI(I, dumpindent,        U16,    4)      /* number of blanks per dump
-                                          indentation level */
+                                           indentation level */
 
 /*
 =for apidoc_section $embedding
@@ -492,7 +492,7 @@ PERLVAR(I, e_script,        SV *)
 PERLVAR(I, basetime,   Time_t)         /* $^T */
 
 PERLVARI(I, maxsysfd,  I32,    MAXSYSFD)
-                                       /* top fd to pass to subprocesses */
+                                        /* top fd to pass to subprocesses */
 PERLVAR(I, statusvalue,        I32)            /* $? */
 #ifdef VMS
 PERLVAR(I, statusvalue_vms, U32)
@@ -612,12 +612,12 @@ PERLVARI(I, laststype,    U16,    OP_STAT)
 PERLVARI(I, laststatval, int,  -1)
 
 PERLVAR(I, modcount,   I32)            /* how much op_lvalue()ification in
-                                          assignment? */
+                                           assignment? */
 
 /* interpreter atexit processing */
 PERLVARI(I, exitlistlen, I32, 0)       /* length of same */
 PERLVARI(I, exitlist,  PerlExitListEntry *, NULL)
-                                       /* list of exit functions */
+                                        /* list of exit functions */
 
 /*
 =for apidoc_section $HV
@@ -650,7 +650,7 @@ PERLVAR(I, comppad_name_floor,      PADOFFSET)/* start of vars in innermost block */
 
 #ifdef HAVE_INTERP_INTERN
 PERLVAR(I, sys_intern, struct interp_intern)
-                                       /* platform internals */
+                                        /* platform internals */
 #endif
 
 /* more statics moved here */
@@ -713,7 +713,7 @@ PERLVAR(I, min_intro_pending, PADOFFSET)/* start of vars to introduce */
 
 PERLVAR(I, max_intro_pending, PADOFFSET)/* end of vars to introduce */
 PERLVAR(I, padix,      PADOFFSET)      /* lowest unused index - 1
-                                          in current "register" pad */
+                                           in current "register" pad */
 PERLVAR(I, constpadix, PADOFFSET)      /* lowest unused for constants */
 
 PERLVAR(I, padix_floor,        PADOFFSET)      /* how low may inner block reset padix */
@@ -722,6 +722,8 @@ PERLVAR(I, padix_floor,     PADOFFSET)      /* how low may inner block reset padix */
  && defined(USE_THREAD_SAFE_LOCALE)         \
  && ! defined(HAS_QUERYLOCALE)
 
+/* This is the most number of categories we've encountered so far on any
+ * platform */
 PERLVARA(I, curlocales, 12, char *)
 
 #endif
@@ -736,7 +738,7 @@ PERLVARI(I, strxfrm_is_behaved, bool, TRUE)
                             /* Assume until proven otherwise that it works */
 PERLVARI(I, strxfrm_max_cp, U8, 0)      /* Highest collating cp in locale */
 PERLVARI(I, collation_standard, bool, TRUE)
-                                       /* Assume simple collation */
+                                        /* Assume simple collation */
 #endif /* USE_LOCALE_COLLATE */
 
 PERLVARI(I, langinfo_buf, char *, NULL)
@@ -795,11 +797,11 @@ PERLVAR(I, srand_called, bool)
 #ifdef USE_LOCALE_NUMERIC
 
 PERLVARI(I, numeric_underlying, bool, TRUE)
-                                       /* Assume underlying locale numerics */
+                                        /* Assume underlying locale numerics */
 PERLVARI(I, numeric_underlying_is_standard, bool, TRUE)
 
 PERLVARI(I, numeric_standard, int, TRUE)
-                                       /* Assume C locale numerics */
+                                        /* Assume C locale numerics */
 PERLVAR(I, numeric_name, char *)       /* Name of current numeric locale */
 PERLVAR(I, numeric_radix_sv, SV *)     /* The radix separator if not '.' */
 
@@ -838,12 +840,12 @@ PERLVAR(I, body_arenas, void *)           /* pointer to list of body-arenas */
 
 #if defined(USE_ITHREADS)
 PERLVAR(I, regex_pad,     SV **)       /* Shortcut into the array of
-                                          regex_padav */
+                                           regex_padav */
 PERLVAR(I, regex_padav,   AV *)                /* All regex objects, indexed via the
-                                          values in op_pmoffset of pmop.
-                                          Entry 0 is an SV whose PV is a
-                                          "packed" list of IVs listing
-                                          the now-free slots in the array */
+                                           values in op_pmoffset of pmop.
+                                           Entry 0 is an SV whose PV is a
+                                           "packed" list of IVs listing
+                                           the now-free slots in the array */
 PERLVAR(I, stashpad,    HV **)         /* for CopSTASH */
 PERLVARI(I, stashpadmax, PADOFFSET, 64)
 PERLVARI(I, stashpadix, PADOFFSET, 0)
@@ -864,7 +866,7 @@ PERLVARI(I, def_layerlist, PerlIO_list_t *, NULL)
 
 PERLVARI(I, checkav_save, AV *, NULL)  /* save CHECK{}s when compiling */
 PERLVARI(I, unitcheckav_save, AV *, NULL)
-                                       /* save UNITCHECK{}s when compiling */
+                                        /* save UNITCHECK{}s when compiling */
 
 PERLVARI(I, clocktick, long,   0)      /* this many times() ticks in a second */
 
@@ -924,12 +926,12 @@ PERLVARI(I, globhook,     globhook_t, NULL)
 #  define PERL_LAST_5_18_0_INTERP_MEMBER       Iglobhook
 #endif
 
-#ifdef PERL_IMPLICIT_CONTEXT
+#ifdef MULTIPLICITY
 PERLVARI(I, my_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers */
 PERLVARI(I, my_cxt_size, int,  0)      /* size of PL_my_cxt_list */
 #endif
 
-#if defined(PERL_IMPLICIT_CONTEXT) || defined(PERL_DEBUG_READONLY_COW)
+#if defined(MULTIPLICITY) || defined(PERL_DEBUG_READONLY_COW)
 /* For use with the memory debugging code in util.c. This is used only in
  * DEBUGGING builds (as long as the relevant structure is defined), but
  * defining it in non-debug builds too means that we retain binary