In perlvar.h, move the always-present globals above those conditionally compiled

Rename PL_interp_size_5_10_0 to PL_interp_size_5_16_0, as it is only intended to
track interpreter size within (forwards) binary compatible maintenance branches.

5 files changed, 31 insertions, 32 deletions

diff --git a/embedvar.h b/embedvar.h
index af58e425a4..bd1d5628dd 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -729,8 +729,8 @@
 #define PL_Ghints_mutex		(my_vars->Ghints_mutex)
 #define PL_interp_size		(my_vars->Ginterp_size)
 #define PL_Ginterp_size		(my_vars->Ginterp_size)
-#define PL_interp_size_5_10_0	(my_vars->Ginterp_size_5_10_0)
-#define PL_Ginterp_size_5_10_0	(my_vars->Ginterp_size_5_10_0)
+#define PL_interp_size_5_16_0	(my_vars->Ginterp_size_5_16_0)
+#define PL_Ginterp_size_5_16_0	(my_vars->Ginterp_size_5_16_0)
 #define PL_keyword_plugin	(my_vars->Gkeyword_plugin)
 #define PL_Gkeyword_plugin	(my_vars->Gkeyword_plugin)
 #define PL_malloc_mutex		(my_vars->Gmalloc_mutex)
@@ -800,7 +800,7 @@
 #define PL_Gglobal_struct_size	PL_global_struct_size
 #define PL_Ghints_mutex		PL_hints_mutex
 #define PL_Ginterp_size		PL_interp_size
-#define PL_Ginterp_size_5_10_0	PL_interp_size_5_10_0
+#define PL_Ginterp_size_5_16_0	PL_interp_size_5_16_0
 #define PL_Gkeyword_plugin	PL_keyword_plugin
 #define PL_Gmalloc_mutex	PL_malloc_mutex
 #define PL_Gmmap_page_size	PL_mmap_page_size
diff --git a/intrpvar.h b/intrpvar.h
index 824bf20820..83b4fdccf7 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -708,6 +708,9 @@ PERLVARI(Iunlockhook,	share_proc_t,	PERL_UNLOCK_HOOK)
 
 PERLVARI(Ithreadhook,	thrhook_proc_t,	Perl_nothreadhook)
 
+/* Can shared object be destroyed */
+PERLVARI(Idestroyhook, destroyable_proc_t, Perl_sv_destroyable)
+
 #ifndef PERL_MICRO
 PERLVARI(Isignalhook,	despatch_signals_proc_t, Perl_despatch_signals)
 #endif
@@ -718,11 +721,30 @@ PERLVARI(Irehash_seed, UV, 0)		/* 582 hash initializer */
 
 PERLVARI(Iisarev, HV*, NULL) /* Reverse map of @ISA dependencies */
 
+/* Register of known Method Resolution Orders.
+   What this actually points to is an implementation detail (it may change to
+   a structure incorporating a reference count - use mro_get_from_name to
+   retrieve a C<struct mro_alg *>  */
+PERLVAR(Iregistered_mros, HV *)
+
+/* Compile-time block start/end hooks */
+PERLVAR(Iblockhooks, AV *)
+
+/* Everything that folds to a given character, for case insensitivity regex
+ * matching */
+PERLVARI(Iutf8_foldclosures,	HV *, NULL)
+
+/* List of characters that participate in folds (except marks, etc in
+ * multi-char folds) */
+PERLVARI(Iutf8_foldable,	HV *, NULL)
+
+PERLVAR(Icustom_ops, HV *)      /* custom op registrations */
+
 /* The last unconditional member of the interpreter structure when 5.10.0 was
    released. The offset of the end of this is baked into a global variable in 
    any shared perl library which will allow a sanity test in future perl
    releases.  */
-#define PERL_LAST_5_10_0_INTERP_MEMBER	Iisarev
+#define PERL_LAST_5_16_0_INTERP_MEMBER	Icustom_ops
 
 #ifdef PERL_IMPLICIT_CONTEXT
 PERLVARI(Imy_cxt_size, int, 0)		/* size of PL_my_cxt_list */
@@ -764,33 +786,10 @@ PERLVARI(Islabs, I32**, NULL)	/* Array of slabs that have been allocated */
 PERLVARI(Islab_count, U32, 0)	/* Size of the array */
 #endif
 
-/* Can shared object be destroyed */
-PERLVARI(Idestroyhook, destroyable_proc_t, Perl_sv_destroyable)
-
 #ifdef DEBUG_LEAKING_SCALARS
 PERLVARI(Isv_serial, U32, 0) /* SV serial number, used in sv.c */
 #endif
 
-/* Register of known Method Resolution Orders.
-   What this actually points to is an implementation detail (it may change to
-   a structure incorporating a reference count - use mro_get_from_name to
-   retrieve a C<struct mro_alg *>  */
-PERLVAR(Iregistered_mros, HV *)
-
-/* Compile-time block start/end hooks */
-PERLVAR(Iblockhooks, AV *)
-
-
-/* Everything that folds to a given character, for case insensitivity regex
- * matching */
-PERLVARI(Iutf8_foldclosures,	HV *, NULL)
-
-/* List of characters that participate in folds (except marks, etc in
- * multi-char folds) */
-PERLVARI(Iutf8_foldable,	HV *, NULL)
-
-PERLVAR(Icustom_ops, HV *)      /* custom op registrations */
-
 /* If you are adding a U8 or U16, check to see if there are 'Space' comments
  * above on where there are gaps which currently will be structure padding.  */
 
diff --git a/makedef.pl b/makedef.pl
index 5b8265a52f..94a0e1a8b8 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -901,7 +901,7 @@ if ($define{'PERL_MAD'}) {
 unless ($define{'MULTIPLICITY'}) {
     skip_symbols [qw(
 		    PL_interp_size
-		    PL_interp_size_5_10_0
+		    PL_interp_size_5_16_0
 		    )];
 }
 
diff --git a/perlapi.h b/perlapi.h
index 7458c67d53..eaddb4e5f6 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -119,8 +119,8 @@ END_EXTERN_C
 #define PL_hints_mutex		(*Perl_Ghints_mutex_ptr(NULL))
 #undef  PL_interp_size
 #define PL_interp_size		(*Perl_Ginterp_size_ptr(NULL))
-#undef  PL_interp_size_5_10_0
-#define PL_interp_size_5_10_0	(*Perl_Ginterp_size_5_10_0_ptr(NULL))
+#undef  PL_interp_size_5_16_0
+#define PL_interp_size_5_16_0	(*Perl_Ginterp_size_5_16_0_ptr(NULL))
 #undef  PL_keyword_plugin
 #define PL_keyword_plugin	(*Perl_Gkeyword_plugin_ptr(NULL))
 #undef  PL_malloc_mutex
diff --git a/perlvars.h b/perlvars.h
index 2facbeba78..bad7a16d8b 100644
--- a/perlvars.h
+++ b/perlvars.h
@@ -159,8 +159,8 @@ PERLVARI(Gglobal_struct_size,	U16,	sizeof(struct perl_vars))
 /* This will be useful for subsequent releases, because this has to be the
    same in your libperl as in main(), else you have a mismatch and must abort.
 */
-PERLVARI(Ginterp_size_5_10_0, U16,
-	 PERL_INTERPRETER_SIZE_UPTO_MEMBER(PERL_LAST_5_10_0_INTERP_MEMBER))
+PERLVARI(Ginterp_size_5_16_0, U16,
+	 PERL_INTERPRETER_SIZE_UPTO_MEMBER(PERL_LAST_5_16_0_INTERP_MEMBER))
 #endif
 
 /*