In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/d399cf59bde32e412ae99791ae46a871c7337b42?hp=f4dc174a8581e2dba27554879e2ae596e9139da3>
- Log -----------------------------------------------------------------
commit d399cf59bde32e412ae99791ae46a871c7337b42
Author: Nicholas Clark <n...@ccl4.org>
Date: Tue Feb 19 19:47:14 2013 +0100
Rename PL_interp_size_5_16_0 to PL_interp_size_5_18_0.
M globvar.sym
M intrpvar.h
M makedef.pl
M perl.h
commit e914d9bb761c46152f77ac90b434b263b133fcbc
Author: Nicholas Clark <n...@ccl4.org>
Date: Tue Feb 19 16:49:34 2013 +0100
Re-order intrpvar.h to minimise holes in the interpreter struct.
Holes were created by commit f59909ab8dad6ceb (April 2012) which removed
PL_reginterp_cnt, commit 7dc8663964c66a69 (Nov 2012) which removed
PL_rehash_seed_set, and commit 8936b48a49448f4e (Dec 2012) which removed
PL_glob_index.
There is still an unavoidable U16 sized hole on the default threaded
configuration on x86_64. (U8 if PERL_SAWAMPERSAND is defined).
M intrpvar.h
-----------------------------------------------------------------------
Summary of changes:
globvar.sym | 2 +-
intrpvar.h | 12 +++++++-----
makedef.pl | 2 +-
perl.h | 4 ++--
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/globvar.sym b/globvar.sym
index 93eca43..8401f21 100644
--- a/globvar.sym
+++ b/globvar.sym
@@ -16,7 +16,7 @@ freq
global_struct_size
hexdigit
interp_size
-interp_size_5_16_0
+interp_size_5_18_0
keyword_plugin
latin1_lc
magic_data
diff --git a/intrpvar.h b/intrpvar.h
index 7a3877b..852f9a0 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -162,6 +162,7 @@ PERLVAR(I, regdummy, regnode) /* from
regcomp.c */
PERLVARI(I, dumpindent, U16, 4) /* number of blanks per dump
indentation level */
+PERLVAR(I, exit_flags, U8) /* was exit() unexpected, etc. */
PERLVAR(I, utf8locale, bool) /* utf8 locale detected */
@@ -297,7 +298,10 @@ PERLVAR(I, dowarn, U8)
PERLVAR(I, sawampersand, U8) /* must save all match strings */
#endif
PERLVAR(I, unsafe, bool)
-PERLVAR(I, exit_flags, U8) /* was exit() unexpected, etc. */
+
+/* Space for U16 (or U8 if PERL_SAWAMPERSAND is defined) */
+
+PERLVAR(I, reentrant_retint, int) /* Integer return value from reentrant
functions */
PERLVAR(I, inplace, char *)
PERLVAR(I, e_script, SV *)
@@ -718,13 +722,11 @@ PERLVAR(I, custom_ops, HV *) /* custom op
registrations */
/* Hook for File::Glob */
PERLVARI(I, globhook, globhook_t, NULL)
-PERLVAR(I, reentrant_retint, int) /* Integer return value from reentrant
functions */
-
-/* The last unconditional member of the interpreter structure when 5.10.0 was
+/* The last unconditional member of the interpreter structure when 5.18.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_16_0_INTERP_MEMBER Ireentrant_retint
+#define PERL_LAST_5_18_0_INTERP_MEMBER Iglobhook
#ifdef PERL_IMPLICIT_CONTEXT
PERLVARI(I, my_cxt_list, void **, NULL) /* per-module array of MY_CXT pointers
*/
diff --git a/makedef.pl b/makedef.pl
index 6c1b8f3..eefbbe4 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -452,7 +452,7 @@ unless ($define{PERL_MAD}) {
unless ($define{'MULTIPLICITY'}) {
++$skip{$_} foreach qw(
PL_interp_size
- PL_interp_size_5_16_0
+ PL_interp_size_5_18_0
);
}
diff --git a/perl.h b/perl.h
index 29c4425..b265f07 100644
--- a/perl.h
+++ b/perl.h
@@ -5027,8 +5027,8 @@ EXTCONST U16 PL_interp_size
/* 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.
*/
-EXTCONST U16 PL_interp_size_5_16_0
- INIT(PERL_INTERPRETER_SIZE_UPTO_MEMBER(PERL_LAST_5_16_0_INTERP_MEMBER));
+EXTCONST U16 PL_interp_size_5_18_0
+ INIT(PERL_INTERPRETER_SIZE_UPTO_MEMBER(PERL_LAST_5_18_0_INTERP_MEMBER));
# ifdef PERL_GLOBAL_STRUCT
--
Perl5 Master Repository
