dougm 01/03/13 16:03:31
Modified: src/modules/perl modperl_filter.c modperl_interp.h
Log:
add MP_dINTERP_SELECT macro so caller doesnt need to deal with THX
Revision Changes Path
1.7 +1 -6 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modperl_filter.c 2001/03/13 23:55:19 1.6
+++ modperl_filter.c 2001/03/14 00:03:29 1.7
@@ -91,12 +91,7 @@
server_rec *s = r ? r->server : NULL;
apr_pool_t *p = r ? r->pool : c->pool;
-#ifdef USE_ITHREADS
- pTHX;
- modperl_interp_t *interp = NULL;
- interp = modperl_interp_select(r, c, s);
- aTHX = interp->perl;
-#endif
+ MP_dINTERP_SELECT(r, c, s);
args = newAV();
1.8 +8 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modperl_interp.h 2000/08/14 03:10:45 1.7
+++ modperl_interp.h 2001/03/14 00:03:29 1.8
@@ -21,6 +21,12 @@
modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
server_rec *s);
+#define MP_dINTERP_SELECT(r, c, s) \
+ pTHX; \
+ modperl_interp_t *interp = NULL; \
+ interp = modperl_interp_select(r, c, s); \
+ aTHX = interp->perl
+
apr_status_t modperl_interp_pool_destroy(void *data);
void modperl_interp_pool_add(modperl_interp_pool_t *mip,
@@ -29,6 +35,8 @@
void modperl_interp_pool_remove(modperl_interp_pool_t *mip,
modperl_interp_t *interp);
+#else
+#define MP_dINTERP_SELECT(r, c, s) dNOOP
#endif
#endif /* MODPERL_INTERP_H */
