dougm 01/02/16 15:30:30 Modified: . Changes src/modules/perl mod_perl.c mod_perl.h perl_util.c Log: adjust U magic functions to Perl 5.7.x-dev prototype change Revision Changes Path 1.581 +2 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.580 retrieving revision 1.581 diff -u -r1.580 -r1.581 --- Changes 2001/02/11 15:33:12 1.580 +++ Changes 2001/02/16 23:30:23 1.581 @@ -10,6 +10,8 @@ =item 1.25_01-dev +adjust 'U' magic functions to Perl 5.7.x-dev prototype change + Put Apache's CFLAGS into AP_CFLAGS instead of CFLAGS, so that people who like to override CFLAGS from the make line (make CFLAGS='-arch ppc -arch i386') can do so without stomping the 1.135 +1 -1 modperl/src/modules/perl/mod_perl.c Index: mod_perl.c =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- mod_perl.c 2000/12/20 06:39:48 1.134 +++ mod_perl.c 2001/02/16 23:30:27 1.135 @@ -382,7 +382,7 @@ } #ifdef PERL_TIE_SCRIPTNAME -static I32 scriptname_val(IV ix, SV* sv) +static PERL_MG_UFUNC(scriptname_val, ix, sv) { dTHR; request_rec *r = perl_request_rec(NULL); 1.108 +4 -0 modperl/src/modules/perl/mod_perl.h Index: mod_perl.h =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- mod_perl.h 2000/12/30 05:08:59 1.107 +++ mod_perl.h 2001/02/16 23:30:27 1.108 @@ -197,6 +197,10 @@ #define AvFILLp(av) ((XPVAV*) SvANY(av))->xav_fill #endif +#ifndef PERL_MG_UFUNC +#define PERL_MG_UFUNC(name,ix,sv) I32 name(IV ix, SV *sv) +#endif + #ifdef eval_pv # ifndef perl_eval_pv # define perl_eval_pv eval_pv 1.45 +1 -2 modperl/src/modules/perl/perl_util.c Index: perl_util.c =================================================================== RCS file: /home/cvs/modperl/src/modules/perl/perl_util.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- perl_util.c 2001/01/05 05:48:14 1.44 +++ perl_util.c 2001/02/16 23:30:28 1.45 @@ -426,8 +426,7 @@ } } -static I32 -errgv_empty_set(IV ix, SV* sv) +static PERL_MG_UFUNC(errgv_empty_set, ix, sv) { sv_setsv(sv, &sv_no); return TRUE;