diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-04-28 14:36:15 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-05-22 21:02:40 +0100 |
| commit | 0cd674b00397cbdf4d09c797f8bcf6bb74e478dc (patch) | |
| tree | 10f7065ee05f872e8f9a5a8b8e6133d4f795ee24 | |
| parent | 15e1c773a868f2b1258c2b392de1bfe28dac773a (diff) | |
| download | perl-0cd674b00397cbdf4d09c797f8bcf6bb74e478dc.tar.gz | |
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]
| -rw-r--r-- | embedvar.h | 3 | ||||
| -rw-r--r-- | globvar.sym | 1 | ||||
| -rw-r--r-- | perlapi.h | 2 | ||||
| -rw-r--r-- | perlvars.h | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/embedvar.h b/embedvar.h index bb179fdcf4..85d7af5b70 100644 --- 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 a4746d2c0a..10ddaaf90c 100644 --- a/globvar.sym +++ b/globvar.sym @@ -5,6 +5,7 @@ bincompat_options block_type +charclass check core_reg_engine fold @@ -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 1a44e22e4e..87a0d8bf16 100644 --- 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 |