Author: gozer Date: Tue Dec 14 17:46:20 2004 New Revision: 111911 URL: http://svn.apache.org/viewcvs?view=rev&rev=111911 Log: modperl_exports.c now wraps all exported functions in a #ifndef function_name wrapper to help in weeding out functions that only make sense for certain Perl configurations (perlio, threads).
This was a fix for modperl_io_apache_init() being exported wrongly when building static against perl-5.6.1 Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/ModPerl/WrapXS.pm perl/modperl/trunk/todo/bugs_build Modified: perl/modperl/trunk/Changes Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=111911&p1=perl/modperl/trunk/Changes&r1=111910&p2=perl/modperl/trunk/Changes&r2=111911 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Tue Dec 14 17:46:20 2004 @@ -12,6 +12,10 @@ =item 1.99_19-dev +modperl_exports.c now wraps all exported functions in a #ifndef +function_name wrapper to help in weeding out functions that only +make sense for certain Perl configurations (perlio, threads) [Gozer] + for make test, skip configuring fastcgi if it's found in the global httpd.conf, as it causes crashes in the test suite [Stas] Modified: perl/modperl/trunk/lib/ModPerl/WrapXS.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?view=diff&rev=111911&p1=perl/modperl/trunk/lib/ModPerl/WrapXS.pm&r1=111910&p2=perl/modperl/trunk/lib/ModPerl/WrapXS.pm&r2=111911 ============================================================================== --- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original) +++ perl/modperl/trunk/lib/ModPerl/WrapXS.pm Tue Dec 14 17:46:20 2004 @@ -1302,7 +1302,12 @@ next if $entry->{name} =~ /^($ithreads_exports)/; } ( my $name ) = $entry->{name} =~ /^modperl_(.*)/; - print $fh "const void *modperl_hack_$name = (const void *)modperl_$name;\n"; + print $fh <<"EOF"; +#ifndef modperl_$name +const void *modperl_hack_$name = (const void *)modperl_$name; +#endif + +EOF } } Modified: perl/modperl/trunk/todo/bugs_build Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/todo/bugs_build?view=diff&rev=111911&p1=perl/modperl/trunk/todo/bugs_build&r1=111910&p2=perl/modperl/trunk/todo/bugs_build&r2=111911 ============================================================================== --- perl/modperl/trunk/todo/bugs_build (original) +++ perl/modperl/trunk/todo/bugs_build Tue Dec 14 17:46:20 2004 @@ -44,6 +44,11 @@ http://marc.theaimsgroup.com/?l=apache-modperl&m=108334017416318&w=2 Static works OK! +* Need to cleanup functions only needed for certain build flavors + (perlio/threads/etc) out of lib/ModPerl/WrapXS.pm:$ithread_exports + and use the newer, simpler #ifdef technique (see modperl_io_apache_init + for an example) + * we should stop generating xs/apache_*, at least for a reason that it's incomplete and will be never complete as we don't keep up with changes with ap_/apr_ namespace. Also we don't have the logic to
