dougm 01/05/04 19:16:05
Modified: lib/ModPerl WrapXS.pm
xs modperl_xs_util.h
xs/Apache/Access Apache__Access.h
xs/Apache/RequestIO Apache__RequestIO.h
Log:
move redefinition of mp_xs_sv2_r to modperl_xs_util.h
Revision Changes Path
1.18 +1 -1 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WrapXS.pm 2001/05/04 21:21:39 1.17
+++ WrapXS.pm 2001/05/05 02:15:58 1.18
@@ -15,7 +15,7 @@
our $VERSION = '0.01';
my(@xs_includes) = ('mod_perl.h',
- map "modperl_xs_$_.h", qw(util typedefs sv_convert));
+ map "modperl_xs_$_.h", qw(sv_convert util typedefs));
sub new {
my $class = shift;
1.8 +4 -0 modperl-2.0/xs/modperl_xs_util.h
Index: modperl_xs_util.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/modperl_xs_util.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modperl_xs_util.h 2001/04/28 22:35:21 1.7
+++ modperl_xs_util.h 2001/05/05 02:16:00 1.8
@@ -1,6 +1,10 @@
#ifndef MODPERL_XS_H
#define MODPERL_XS_H
+/* XXX: should be part of generation */
+#undef mp_xs_sv2_r /* defined in modperl_xs_sv_convert.h */
+#define mp_xs_sv2_r(sv) modperl_sv2request_rec(aTHX_ sv)
+
#define mpxs_Apache__RequestRec_pool(r) r->pool
#define mpxs_Apache__Connection_pool(c) c->pool
#define mpxs_Apache__URI_pool(u) ((modperl_uri_t *)u)->pool
1.4 +0 -4 modperl-2.0/xs/Apache/Access/Apache__Access.h
Index: Apache__Access.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Access/Apache__Access.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__Access.h 2001/05/05 02:06:11 1.3
+++ Apache__Access.h 2001/05/05 02:16:01 1.4
@@ -58,10 +58,6 @@
return newRV_noinc((SV*)av);
}
-/* XXX: should be part of generation */
-#undef mp_xs_sv2_r
-#define mp_xs_sv2_r(sv) modperl_sv2request_rec(aTHX_ sv)
-
static MP_INLINE
void mpxs_ap_allow_methods(pTHX_ I32 items, SV **MARK, SV **SP)
{
1.8 +0 -4 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Apache__RequestIO.h 2001/04/30 07:17:49 1.7
+++ Apache__RequestIO.h 2001/05/05 02:16:03 1.8
@@ -1,7 +1,3 @@
-/* XXX: should be part of generation */
-#undef mp_xs_sv2_r
-#define mp_xs_sv2_r(sv) modperl_sv2request_rec(aTHX_ sv)
-
#define mpxs_Apache__RequestRec_TIEHANDLE(stashsv, sv) \
modperl_newSVsv_obj(aTHX_ stashsv, sv)
