dougm 01/09/16 10:28:43 Modified: src/modules/perl modperl_interp.h modperl_perl.c modperl_perl.h Log: fixes to compile with non-ithreads perl Revision Changes Path 1.13 +6 -4 modperl-2.0/src/modules/perl/modperl_interp.h Index: modperl_interp.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- modperl_interp.h 2001/09/16 00:54:33 1.12 +++ modperl_interp.h 2001/09/16 17:28:43 1.13 @@ -7,6 +7,7 @@ apr_status_t modperl_interp_cleanup(void *data); #ifdef USE_ITHREADS + const char *modperl_interp_scope_desc(modperl_interp_scope_e scope); void modperl_interp_clone_init(modperl_interp_t *interp); @@ -38,10 +39,6 @@ void modperl_interp_pool_remove(modperl_interp_pool_t *mip, modperl_interp_t *interp); -#else -#define MP_dINTERP_SELECT(r, c, s) dNOOP -#endif - typedef apr_status_t (*modperl_interp_mip_walker_t)(pTHX_ modperl_interp_pool_t *mip, void *data); @@ -56,5 +53,10 @@ server_rec *base_server, modperl_interp_mip_walker_t walker, void *data); +#else + +#define MP_dINTERP_SELECT(r, c, s) dNOOP + +#endif /* USE_ITHREADS */ #endif /* MODPERL_INTERP_H */ 1.4 +11 -7 modperl-2.0/src/modules/perl/modperl_perl.c Index: modperl_perl.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- modperl_perl.c 2001/09/16 01:05:44 1.3 +++ modperl_perl.c 2001/09/16 17:28:43 1.4 @@ -32,13 +32,6 @@ #endif } -apr_status_t modperl_perl_init_ids_mip(pTHX_ modperl_interp_pool_t *mip, - void *data) -{ - modperl_perl_init_ids(aTHX_ (modperl_perl_ids_t *)data); - return APR_SUCCESS; -} - void modperl_perl_init_ids_server(server_rec *s) { modperl_perl_ids_t ids; @@ -51,3 +44,14 @@ modperl_perl_init_ids(aTHX_ &ids); #endif } + +#ifdef USE_ITHREADS + +apr_status_t modperl_perl_init_ids_mip(pTHX_ modperl_interp_pool_t *mip, + void *data) +{ + modperl_perl_init_ids(aTHX_ (modperl_perl_ids_t *)data); + return APR_SUCCESS; +} + +#endif /* USE_ITHREADS */ 1.4 +5 -1 modperl-2.0/src/modules/perl/modperl_perl.h Index: modperl_perl.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- modperl_perl.h 2001/09/16 01:05:44 1.3 +++ modperl_perl.h 2001/09/16 17:28:43 1.4 @@ -11,9 +11,13 @@ void modperl_perl_init_ids(pTHX_ modperl_perl_ids_t *ids); +void modperl_perl_init_ids_server(server_rec *s); + +#ifdef USE_ITHREADS + apr_status_t modperl_perl_init_ids_mip(pTHX_ modperl_interp_pool_t *mip, void *data); -void modperl_perl_init_ids_server(server_rec *s); +#endif /* USE_ITHREADS */ #endif /* MODPERL_PERL_H */