stas 2003/09/23 13:12:11
Modified: src/modules/perl modperl_callback.c modperl_filter.c
modperl_interp.h
Log:
the usual fix of declaration after code problem. Looking forward for the
new gcc flag: -Wdeclaration-after-code which will alert us when this
happens.
Revision Changes Path
1.59 +1 -3 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -u -r1.58 -r1.59
--- modperl_callback.c 18 Sep 2003 07:46:26 -0000 1.58
+++ modperl_callback.c 23 Sep 2003 20:12:11 -0000 1.59
@@ -268,9 +268,7 @@
SvREFCNT_dec((SV*)av_args);
/* PerlInterpScope handler */
-#ifdef USE_ITHREADS
- MP_dINTERP_PUTBACK(interp);
-#endif
+ MP_INTERP_PUTBACK(interp);
return status;
}
1.69 +2 -2 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.68
retrieving revision 1.69
diff -u -u -r1.68 -r1.69
--- modperl_filter.c 18 Sep 2003 07:34:21 -0000 1.68
+++ modperl_filter.c 23 Sep 2003 20:12:11 -0000 1.69
@@ -360,7 +360,7 @@
SvREFCNT_dec((SV*)args);
- MP_dINTERP_PUTBACK(interp);
+ MP_INTERP_PUTBACK(interp);
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
"return: %d\n", handler->name, status);
@@ -432,7 +432,7 @@
MP_FAILURE_CROAK(modperl_output_filter_flush(filter));
}
- MP_dINTERP_PUTBACK(interp);
+ MP_INTERP_PUTBACK(interp);
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
"return: %d\n", handler->name, status);
1.20 +2 -2 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.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- modperl_interp.h 13 Sep 2003 20:35:33 -0000 1.19
+++ modperl_interp.h 23 Sep 2003 20:12:11 -0000 1.20
@@ -50,7 +50,7 @@
interp = modperl_interp_select(r, c, s); \
aTHX = interp->perl
-#define MP_dINTERP_PUTBACK(interp) \
+#define MP_INTERP_PUTBACK(interp) \
if (interp && MpInterpPUTBACK(interp)) { \
modperl_interp_unselect(interp); \
}
@@ -77,7 +77,7 @@
#define MP_dINTERP_SELECT(r, c, s) dNOOP
-#define MP_dINTERP_PUTBACK(interp) dNOOP
+#define MP_INTERP_PUTBACK(interp) NOOP
#define MP_aTHX 0
