stas 2003/07/06 20:06:15
Modified: src/modules/perl mod_perl.c modperl_env.c modperl_env.h modperl_perl_global.c modperl_perl_global.h xs/tables/current/ModPerl FunctionTable.pm Log: perl's PERL_HASH now requires pTHX Revision Changes Path 1.173 +2 -2 modperl-2.0/src/modules/perl/mod_perl.c Index: mod_perl.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- mod_perl.c 20 May 2003 06:53:47 -0000 1.172 +++ mod_perl.c 7 Jul 2003 03:06:14 -0000 1.173 @@ -532,8 +532,8 @@ ap_add_version_component(pconf, Perl_form(aTHX_ "Perl/v%vd", PL_patchlevel)); modperl_mgv_hash_handlers(pconf, s); - modperl_modglobal_hash_keys(); - modperl_env_hash_keys(); + modperl_modglobal_hash_keys(aTHX); + modperl_env_hash_keys(aTHX); #ifdef USE_ITHREADS modperl_init_clones(s, pconf); #endif 1.27 +1 -1 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.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- modperl_env.c 22 Oct 2002 02:42:03 -0000 1.26 +++ modperl_env.c 7 Jul 2003 03:06:14 -0000 1.27 @@ -41,7 +41,7 @@ { NULL } }; -void modperl_env_hash_keys(void) +void modperl_env_hash_keys(pTHX) { modperl_env_ent_t *ent = MP_env_const_vars; 1.14 +1 -1 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- modperl_env.h 22 Oct 2002 02:42:03 -0000 1.13 +++ modperl_env.h 7 Jul 2003 03:06:14 -0000 1.14 @@ -14,7 +14,7 @@ #define modperl_envelem_tie(sv, key, klen) \ sv_magic(sv, Nullsv, 'e', key, klen) -void modperl_env_hash_keys(void); +void modperl_env_hash_keys(pTHX); void modperl_env_clear(pTHX); 1.18 +1 -1 modperl-2.0/src/modules/perl/modperl_perl_global.c Index: modperl_perl_global.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_global.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- modperl_perl_global.c 2 Jul 2003 14:16:00 -0000 1.17 +++ modperl_perl_global.c 7 Jul 2003 03:06:14 -0000 1.18 @@ -26,7 +26,7 @@ { NULL }, }; -void modperl_modglobal_hash_keys(void) +void modperl_modglobal_hash_keys(pTHX) { modperl_modglobal_key_t *gkey = MP_modglobal_keys; 1.11 +1 -1 modperl-2.0/src/modules/perl/modperl_perl_global.h Index: modperl_perl_global.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_global.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- modperl_perl_global.h 19 Oct 2001 16:40:44 -0000 1.10 +++ modperl_perl_global.h 7 Jul 2003 03:06:14 -0000 1.11 @@ -49,7 +49,7 @@ modperl_perl_global_svpv_t rs; } modperl_perl_globals_t; -void modperl_modglobal_hash_keys(void); +void modperl_modglobal_hash_keys(pTHX); modperl_modglobal_key_t *modperl_modglobal_lookup(pTHX_ const char *name); 1.117 +12 -2 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm Index: FunctionTable.pm =================================================================== RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- FunctionTable.pm 4 Jun 2003 16:50:38 -0000 1.116 +++ FunctionTable.pm 7 Jul 2003 03:06:14 -0000 1.117 @@ -1591,7 +1591,12 @@ { 'return_type' => 'void', 'name' => 'modperl_env_hash_keys', - 'args' => [] + 'args' => [ + { + 'type' => 'PerlInterpreter *', + 'name' => 'my_perl' + } + ] }, { 'return_type' => 'void', @@ -3104,7 +3109,12 @@ { 'return_type' => 'void', 'name' => 'modperl_modglobal_hash_keys', - 'args' => [] + 'args' => [ + { + 'type' => 'PerlInterpreter *', + 'name' => 'my_perl' + } + ] }, { 'return_type' => 'modperl_modglobal_key_t *',