diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-02-19 18:23:51 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-02-19 18:23:51 +0000 |
| commit | 3e5928301057155786b1e13b4cc0efad5ef9b27f (patch) | |
| tree | deed6902b8400fca5db372584919e79be25374b5 | |
| parent | 66e6b4c55568ab053eb52b573c61e4e3f9235b32 (diff) | |
| download | perl-3e5928301057155786b1e13b4cc0efad5ef9b27f.tar.gz | |
Revert change #28980 per Jarkko's suggestion
(it was actually breaking g++ builds)
p4raw-link: @28980 on //depot/perl: 6e8dae779caa61392088d43ba93888dc57f1df7e
p4raw-id: //depot/perl@30357
| -rw-r--r-- | ext/Encode/bin/enc2xs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/Encode/bin/enc2xs b/ext/Encode/bin/enc2xs index 2179f6192e..95067c8244 100644 --- a/ext/Encode/bin/enc2xs +++ b/ext/Encode/bin/enc2xs @@ -271,8 +271,6 @@ if ($doC) # push(@{$encoding{$name}},outstring(\*C,$e2u->{Cname}.'_def',$erep)); } - my $cpp = ($Config{d_cplusplus} || '') eq 'define'; - my $ext_c = $cpp ? 'extern "C" ' : ""; foreach my $enc (sort cmp_name keys %encoding) { # my ($e2u,$u2e,$rep,$min_el,$max_el,$rsym) = @{$encoding{$enc}}; @@ -284,9 +282,9 @@ if ($doC) $sym =~ s/\W+/_/g; my @info = ($e2u->{Cname},$u2e->{Cname},"${sym}_rep_character",$replen, $min_el,$max_el); - print C "${ext_c}static const U8 ${sym}_rep_character[] = \"$rep\";\n"; - print C "${ext_c}static const char ${sym}_enc_name[] = \"$enc\";\n\n"; - print C "${ext_c}const encode_t $sym = \n"; + print C "static const U8 ${sym}_rep_character[] = \"$rep\";\n"; + print C "static const char ${sym}_enc_name[] = \"$enc\";\n\n"; + print C "const encode_t $sym = \n"; # This is to make null encoding work -- dankogai for (my $i = (scalar @info) - 1; $i >= 0; --$i){ $info[$i] ||= 1; |