The U32 alignment test wasn't really working, noticed

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

diff --git a/perlvars.h b/perlvars.h
index ecb450e..606f7a5 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -11,16 +11,16 @@
  *
  * The 'G' prefix is only needed for vars that need appropriate #defines
  * 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,
- * we can keep binary compatibility of the curinterp structure */
-
+ * the appropriate export list for win32. */
 
 /* global state */
 PERLVAR(Gcurinterp,    PerlInterpreter *)
                                        /* currently running interpreter
-                                        * XXX this needs to be in TLS */
+                                        * (initial parent interpreter under
+                                        * useithreads) */
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+PERLVAR(Gthr_key,      perl_key)       /* key to retrieve per-thread struct */
+#endif
 
 /* constants (these are not literals to facilitate pointer comparisons) */
 PERLVARIC(GYes,                char *, "1")
@@ -31,6 +31,17 @@ PERLVARIC(Gpatleave, char *, "\\.^$@dDwWsSbB+*?|()-nrtfeaxc0123456789[{]}")
 /* XXX does anyone even use this? */
 PERLVARI(Gdo_undump,   bool,   FALSE)  /* -u or dump seen? */
 
-#ifdef MYMALLOC
+#if defined(MYMALLOC) && (defined(USE_5005THREADS) || defined(USE_ITHREADS))
 PERLVAR(Gmalloc_mutex, perl_mutex)     /* Mutex for malloc */
 #endif
+
+#if defined(USE_ITHREADS)
+PERLVAR(Gop_mutex,     perl_mutex)     /* Mutex for op refcounting */
+PERLVAR(Gsharedsv_space, PerlInterpreter*) /* The shared sv space */
+PERLVAR(Gsharedsv_space_mutex, perl_mutex) /* Mutex protecting the shared sv space */
+#endif
+
+/* Force inclusion of both runops options */
+PERLVARI(Grunops_std,  runops_proc_t,  MEMBER_TO_FPTR(Perl_runops_standard))
+PERLVARI(Grunops_dbg,  runops_proc_t,  MEMBER_TO_FPTR(Perl_runops_debug))
+