undo goofed change 1157 (backed out the fix instead of keeping it)

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

diff --git a/perlvars.h b/perlvars.h
index b5488ab..9bbd615 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -19,6 +19,7 @@ PERLVAR(Geval_owner,  struct perl_thread *)           /* Owner thread for doeval */
 PERLVAR(Gnthreads,     int)            /* Number of threads currently */
 PERLVAR(Gthreads_mutex,        perl_mutex)             /* Mutex for nthreads and thread list */
 PERLVAR(Gnthreads_cond,        perl_cond)              /* Condition variable for nthreads */
+PERLVAR(Gsvref_mutex,  perl_mutex)             /* Mutex for SvREFCNT_{inc,dec} */
 PERLVARI(Gthreadsv_names,      char *, THREADSV_NAMES) 
 #ifdef FAKE_THREADS
 PERLVAR(Gcurthr,       struct perl_thread *)   /* Currently executing (fake) thread */
@@ -53,7 +54,11 @@ 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 */
@@ -102,7 +107,6 @@ PERLVAR(Gmulti_end, I32)            /* last line of multi-line string */
 PERLVAR(Gmulti_open,   I32)            /* delimiter of said string */
 PERLVAR(Gmulti_close,  I32)            /* delimiter of said string */
 
-PERLVAR(Gscrgv,        GV *)           
 PERLVAR(Gerror_count,  I32)            /* how many errors so far, max 10 */
 PERLVAR(Gsubline,      I32)            /* line this subroutine began on */
 PERLVAR(Gsubname,      SV *)           /* name of current subroutine */
@@ -157,3 +161,11 @@ PERLVARI(Gnumeric_local,   bool,   TRUE)   /* Assume local numerics */
 
 #endif /* !USE_LOCALE_NUMERIC */
 
+/* constants (these are not literals to facilitate pointer comparisons) */
+PERLVARIC(GYes,                char *, "1")
+PERLVARIC(GNo,         char *, "")
+PERLVARIC(Ghexdigit,   char *, "0123456789abcdef0123456789ABCDEFx")
+PERLVARIC(Gpatleave,   char *, "\\.^$@dDwWsSbB+*?|()-nrtfeaxc0123456789[{]}")
+
+PERLVAR(Gspecialsv_list[4], SV *)              /* from byterun.h */
+