stas 2004/10/15 12:26:06
Modified: lib/ModPerl FunctionMap.pm
. Changes
Log:
fix xs_generate to croak on duplicate entries in xs/maps files
Submitted by: Christian Krause <[EMAIL PROTECTED]>
Revision Changes Path
1.12 +6 -0 modperl-2.0/lib/ModPerl/FunctionMap.pm
Index: FunctionMap.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/FunctionMap.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- FunctionMap.pm 4 Mar 2004 06:01:06 -0000 1.11
+++ FunctionMap.pm 15 Oct 2004 19:26:06 -0000 1.12
@@ -135,6 +135,9 @@
if ($name =~ s/^(\W)// or not $cur{MODULE} or $disabled) {
#notimplemented or cooked by hand
+ die qq[function '$name' appears more than once in xs/maps files]
+ if $map->{$name};
+
$map->{$name} = undef;
push @{ $self->{disabled}->{ $1 || '!' } }, $name;
next;
@@ -160,6 +163,9 @@
$name =~ s{^(DEFINE_)(.*)}
{$1 . ModPerl::WrapXS::make_prefix($2, $cur{CLASS})}e;
}
+
+ die qq[function '$name' appears more than once in xs/maps files]
+ if $map->{$name};
my $entry = $map->{$name} = {
name => $alias || $name,
1.513 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -u -r1.512 -r1.513
--- Changes 14 Oct 2004 18:25:01 -0000 1.512
+++ Changes 15 Oct 2004 19:26:06 -0000 1.513
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+fix xs_generate to croak on duplicate entries in xs/maps files
+[Christian Krause <chkr plauener.de>]
+
Workaround a possible bug in Perl_load_module() [Gozer]
Fix a problem building with non-GNU make (can't make target dynamic
