Restore building with -DPERL_GLOBAL_STRUCT, broken since 4dc941f7cb795735.

As PL_charclass is a constant, it doesn't need to be accessed via the global
struct. It should be exported via globvar.sym, not PERLVARA() in perlvars.h

[With a PERVARA() it all compiles perfectly, once C<dVAR>s are added where
now needed, but the build loops forever because the (real) charclass array is
never initialised]

diff --git a/embedvar.h b/embedvar.h
index bb179fd..85d7af5 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -715,8 +715,6 @@
 #define PL_GYes                        (my_vars->GYes)
 #define PL_appctx              (my_vars->Gappctx)
 #define PL_Gappctx             (my_vars->Gappctx)
-#define PL_charclass           (my_vars->Gcharclass)
-#define PL_Gcharclass          (my_vars->Gcharclass)
 #define PL_check               (my_vars->Gcheck)
 #define PL_Gcheck              (my_vars->Gcheck)
 #define PL_csighandlerp                (my_vars->Gcsighandlerp)
@@ -807,7 +805,6 @@
 #define PL_GNo                 PL_No
 #define PL_GYes                        PL_Yes
 #define PL_Gappctx             PL_appctx
-#define PL_Gcharclass          PL_charclass
 #define PL_Gcheck              PL_check
 #define PL_Gcsighandlerp       PL_csighandlerp
 #define PL_Gcurinterp          PL_curinterp

diff --git a/globvar.sym b/globvar.sym
index a4746d2..10ddaaf 100644 (file)
--- a/globvar.sym
+++ b/globvar.sym
@@ -5,6 +5,7 @@
 
 bincompat_options
 block_type
+charclass
 check
 core_reg_engine
 fold

diff --git a/perlapi.h b/perlapi.h
index d7d55d6..ddbb120 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -111,8 +111,6 @@ END_EXTERN_C
 #define PL_Yes                 (*Perl_GYes_ptr(NULL))
 #undef  PL_appctx
 #define PL_appctx              (*Perl_Gappctx_ptr(NULL))
-#undef  PL_charclass
-#define PL_charclass           (*Perl_Gcharclass_ptr(NULL))
 #undef  PL_check
 #define PL_check               (*Perl_Gcheck_ptr(NULL))
 #undef  PL_csighandlerp

diff --git a/perlvars.h b/perlvars.h
index 1a44e22..87a0d8b 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -116,7 +116,6 @@ PERLVAR(Gwatch_pvx, char*)
 PERLVAR(Gppaddr, Perl_ppaddr_t*) /* or opcode.h */
 PERLVAR(Gcheck,  Perl_check_t *) /* or opcode.h */
 PERLVARA(Gfold_locale, 256, unsigned char) /* or perl.h */
-PERLVARA(Gcharclass, 256, U32)
 #endif
 
 #ifdef PERL_NEED_APPCTX