More de-cut-and-pastos.

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

diff --git a/perlvars.h b/perlvars.h
index 4ccfc58..3860345 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -10,7 +10,7 @@
  * and how they're initialized.
  *
  * The 'G' prefix is only needed for vars that need appropriate #defines
- * generated when built with or without EMBED.  It is also used to generate
+ * generated in embed*.h.  Such symbols are also used to generate
  * the appropriate export list for win32.
  *
  * Avoid build-specific #ifdefs here, like DEBUGGING.  That way,
@@ -37,6 +37,9 @@ PERLVARI(Gthreadsv_names,char *,      THREADSV_NAMES)
 PERLVAR(Gcurthr,       struct perl_thread *)
                                        /* Currently executing (fake) thread */
 #endif
+
+PERLVAR(Gcred_mutex,   perl_mutex)     /* altered credentials in effect */
+
 #endif /* USE_THREADS */
 
 PERLVAR(Gninterps,     int)            /* number of active interpreters */
@@ -67,15 +70,9 @@ PERLVAR(Ghe_root,    HE *)           /* free he list--shared by interpreters */
 PERLVAR(Gnice_chunk,   char *)         /* a nice chunk of memory to reuse */
 PERLVAR(Gnice_chunk_size,      U32)    /* how nice the chunk of memory is */
 
-#ifdef PERL_OBJECT
 PERLVARI(Grunops,      runops_proc_t,  FUNC_NAME_TO_PTR(RUNOPS_DEFAULT))
-#else
-PERLVARI(Grunops,      runops_proc_t *,        RUNOPS_DEFAULT)
-#endif
 
 PERLVAR(Gtokenbuf[256],        char)
-PERLVAR(Gna,           STRLEN)         /* for use in SvPV when length is
-                                          Not Applicable */
 
 PERLVAR(Gsv_undef,     SV)
 PERLVAR(Gsv_no,                SV)
@@ -171,28 +168,35 @@ PERLVARI(Gnumeric_local,  bool,   TRUE)
 #endif /* !USE_LOCALE_NUMERIC */
 
 /* utf8 character classes */
-PERLVAR(Gutf8_alnum, SV *)
-PERLVAR(Gutf8_alpha, SV *)
-PERLVAR(Gutf8_space, SV *)
-PERLVAR(Gutf8_digit, SV *)
-PERLVAR(Gutf8_upper, SV *)
-PERLVAR(Gutf8_lower, SV *)
-PERLVAR(Gutf8_print, SV *)
-PERLVAR(Gutf8_mark, SV *)
-PERLVAR(Gutf8_toupper, SV *)
-PERLVAR(Gutf8_totitle, SV *)
-PERLVAR(Gutf8_tolower, SV *)
-PERLVAR(Glast_swash_hv, HV *)
-PERLVAR(Glast_swash_klen, U32)
-PERLVAR(Glast_swash_key[10], U8)
-PERLVAR(Glast_swash_tmps, U8 *)
-PERLVAR(Glast_swash_slen, STRLEN)
+PERLVAR(Gutf8_alnum,   SV *)
+PERLVAR(Gutf8_alpha,   SV *)
+PERLVAR(Gutf8_space,   SV *)
+PERLVAR(Gutf8_digit,   SV *)
+PERLVAR(Gutf8_upper,   SV *)
+PERLVAR(Gutf8_lower,   SV *)
+PERLVAR(Gutf8_print,   SV *)
+PERLVAR(Gutf8_mark,    SV *)
+PERLVAR(Gutf8_toupper, SV *)
+PERLVAR(Gutf8_totitle, SV *)
+PERLVAR(Gutf8_tolower, SV *)
+PERLVAR(Glast_swash_hv,        HV *)
+PERLVAR(Glast_swash_klen,      U32)
+PERLVAR(Glast_swash_key[10],   U8)
+PERLVAR(Glast_swash_tmps,      U8 *)
+PERLVAR(Glast_swash_slen,      STRLEN)
 
 /* constants (these are not literals to facilitate pointer comparisons) */
 PERLVARIC(GYes,                char *, "1")
 PERLVARIC(GNo,         char *, "")
-PERLVARIC(Ghexdigit,   char *, "0123456789abcdef0123456789ABCDEFx")
+PERLVARIC(Ghexdigit,   char *, "0123456789abcdef0123456789ABCDEF")
 PERLVARIC(Gpatleave,   char *, "\\.^$@dDwWsSbB+*?|()-nrtfeaxc0123456789[{]}")
 
 PERLVAR(Gspecialsv_list[4],SV *)       /* from byterun.h */
 
+/* perly.c globals */
+PERLVAR(Gyydebug,      int)
+PERLVAR(Gyynerrs,      int)
+PERLVAR(Gyyerrflag,    int)
+PERLVAR(Gyychar,       int)
+PERLVAR(Gyyval,                YYSTYPE)
+PERLVAR(Gyylval,       YYSTYPE)