dougm 01/09/28 09:39:15 Modified: src/modules/perl modperl_env.c modperl_env.h Log: cut down on some noise with new ENVHV macro Revision Changes Path 1.9 +4 -4 modperl-2.0/src/modules/perl/modperl_env.c Index: modperl_env.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modperl_env.c 2001/09/28 15:16:06 1.8 +++ modperl_env.c 2001/09/28 16:39:15 1.9 @@ -1,6 +1,6 @@ #include "mod_perl.h" -#define EnvMgObj SvMAGIC((SV*)GvHV(PL_envgv))->mg_ptr +#define EnvMgObj SvMAGIC((SV*)ENVHV)->mg_ptr static MP_INLINE void modperl_env_hv_store(pTHX_ HV *hv, apr_table_entry_t *elt) @@ -39,7 +39,7 @@ void modperl_env_request_populate(pTHX_ request_rec *r) { MP_dRCFG; - HV *hv = GvHV(PL_envgv); + HV *hv = ENVHV; int i; U32 mg_flags; apr_array_header_t *array; @@ -121,7 +121,7 @@ PL_vtbl_envelem.svt_set = MEMBER_TO_FPTR(modperl_env_request_set); #ifdef MP_PERL_HV_GMAGICAL_AWARE - SvGMAGICAL_on((SV*)GvHV(PL_envgv)); + SvGMAGICAL_on((SV*)ENVHV); PL_vtbl_envelem.svt_get = MEMBER_TO_FPTR(modperl_env_request_get); #endif } @@ -130,7 +130,7 @@ { PL_vtbl_envelem.svt_set = MEMBER_TO_FPTR(Perl_magic_setenv); #ifdef MP_PERL_HV_GMAGICAL_AWARE - SvGMAGICAL_off((SV*)GvHV(PL_envgv)); + SvGMAGICAL_off((SV*)ENVHV); PL_vtbl_envelem.svt_get = 0; #endif } 1.5 +7 -3 modperl-2.0/src/modules/perl/modperl_env.h Index: modperl_env.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modperl_env.h 2001/09/28 15:16:06 1.4 +++ modperl_env.h 2001/09/28 16:39:15 1.5 @@ -1,12 +1,16 @@ #ifndef MODPERL_ENV_H #define MODPERL_ENV_H +#ifndef ENVHV +# define ENVHV GvHV(PL_envgv) +#endif + #define modperl_env_untie(mg_flags) \ - mg_flags = SvMAGICAL((SV*)GvHV(PL_envgv)); \ - SvMAGICAL_off((SV*)GvHV(PL_envgv)) + mg_flags = SvMAGICAL((SV*)ENVHV); \ + SvMAGICAL_off((SV*)ENVHV) #define modperl_env_tie(mg_flags) \ - SvFLAGS((SV*)GvHV(PL_envgv)) |= mg_flags + SvFLAGS((SV*)ENVHV) |= mg_flags void modperl_env_request_populate(pTHX_ request_rec *r);