Following 32238, change "interpreter_size" to "interp_size" in the new

global symbols to keep overall symbol length within 31 characters,
which is what the VMS C compiler with default flags can handle.

p4raw-id: //depot/perl@32275

diff --git a/embedvar.h b/embedvar.h
index 8eab8c8..3419aa7 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -691,10 +691,10 @@
 #define PL_Ghexdigit           (my_vars->Ghexdigit)
 #define PL_hints_mutex         (my_vars->Ghints_mutex)
 #define PL_Ghints_mutex                (my_vars->Ghints_mutex)
-#define PL_interpreter_size    (my_vars->Ginterpreter_size)
-#define PL_Ginterpreter_size   (my_vars->Ginterpreter_size)
-#define PL_interpreter_size_5_10_0     (my_vars->Ginterpreter_size_5_10_0)
-#define PL_Ginterpreter_size_5_10_0    (my_vars->Ginterpreter_size_5_10_0)
+#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_malloc_mutex                (my_vars->Gmalloc_mutex)
 #define PL_Gmalloc_mutex       (my_vars->Gmalloc_mutex)
 #define PL_mmap_page_size      (my_vars->Gmmap_page_size)
@@ -772,8 +772,8 @@
 #define PL_Gglobal_struct_size PL_global_struct_size
 #define PL_Ghexdigit           PL_hexdigit
 #define PL_Ghints_mutex                PL_hints_mutex
-#define PL_Ginterpreter_size   PL_interpreter_size
-#define PL_Ginterpreter_size_5_10_0    PL_interpreter_size_5_10_0
+#define PL_Ginterp_size                PL_interp_size
+#define PL_Ginterp_size_5_10_0 PL_interp_size_5_10_0
 #define PL_Gmalloc_mutex       PL_malloc_mutex
 #define PL_Gmmap_page_size     PL_mmap_page_size
 #define PL_Gmy_ctx_mutex       PL_my_ctx_mutex

diff --git a/makedef.pl b/makedef.pl
index 812ae89..96ca14d 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -893,8 +893,8 @@ if ($define{'PERL_MAD'}) {
 
 unless ($define{'MULTIPLICITY'}) {
     skip_symbols [qw(
-                   PL_interpreter_size
-                   PL_interpreter_size_5_10_0
+                   PL_interp_size
+                   PL_interp_size_5_10_0
                    )];
 }
 

diff --git a/perlapi.h b/perlapi.h
index 05479bf..9fe7a05 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -756,10 +756,10 @@ END_EXTERN_C
 #define PL_hexdigit            (*Perl_Ghexdigit_ptr(NULL))
 #undef  PL_hints_mutex
 #define PL_hints_mutex         (*Perl_Ghints_mutex_ptr(NULL))
-#undef  PL_interpreter_size
-#define PL_interpreter_size    (*Perl_Ginterpreter_size_ptr(NULL))
-#undef  PL_interpreter_size_5_10_0
-#define PL_interpreter_size_5_10_0     (*Perl_Ginterpreter_size_5_10_0_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_malloc_mutex
 #define PL_malloc_mutex                (*Perl_Gmalloc_mutex_ptr(NULL))
 #undef  PL_mmap_page_size

diff --git a/perlvars.h b/perlvars.h
index de3c63b..49f4d5e 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -175,7 +175,7 @@ PERLVARI(Gsubversion,       U8,     PERL_SUBVERSION)
     sizeof(((struct interpreter*)0)->member)
 
 /* These might be useful.  */
-PERLVARI(Ginterpreter_size,    U16,    sizeof(struct interpreter))
+PERLVARI(Ginterp_size, U16,    sizeof(struct interpreter))
 #if defined(PERL_GLOBAL_STRUCT)
 PERLVARI(Gglobal_struct_size,  U16,    sizeof(struct perl_vars))
 #endif
@@ -183,6 +183,6 @@ 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(Ginterpreter_size_5_10_0, U16,
+PERLVARI(Ginterp_size_5_10_0, U16,
         PERL_INTERPRETER_SIZE_UPTO_MEMBER(PERL_LAST_5_10_0_INTERP_MEMBER))
 #endif