Integrate perlio:

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

diff --git a/intrpvar.h b/intrpvar.h
index 8ecd10f..f84f384 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -362,9 +362,9 @@ PERLVARI(Inumeric_standard, bool,   TRUE)
                                        /* Assume simple numerics */
 PERLVARI(Inumeric_local,       bool,   TRUE)
                                        /* Assume local numerics */
-PERLVAR(Inumeric_radix,                SV *)
-                                       /* The radix separator if not '.' */
 
+PERLVAR(Inumeric_compat1,              char)
+                                       /* Used to be numeric_radix */
 #endif /* !USE_LOCALE_NUMERIC */
 
 /* utf8 character classes */
@@ -464,10 +464,22 @@ PERLVAR(Ixpvlv_arenaroot,XPVLV*)  /* list of allocated xpvlv areas */
 PERLVAR(Ixpvbm_arenaroot,XPVBM*)       /* list of allocated xpvbm areas */
 PERLVAR(Ihe_arenaroot, XPV*)           /* list of allocated he areas */
 
+     /* 5.6.0 stopped here */
+
 PERLVAR(Ipsig_pend, int *)             /* per-signal "count" of pending */
 PERLVARI(Isig_pending, int,0)           /* Number if highest signal pending */
 
+#ifdef USE_LOCALE_NUMERIC
+
+PERLVAR(Inumeric_radix_sv,     SV *)   /* The radix separator if not '.' */
+
+#endif
 
 /* New variables must be added to the very end for binary compatibility.
  * XSUB.h provides wrapper functions via perlapi.h that make this
  * irrelevant, but not all code may be expected to #include XSUB.h. */
+
+#if defined(USE_ITHREADS)
+PERLVAR(Iclone_callbacks, AV*)  /* used for collecting callbacks during perl_clone*/
+#endif
+