diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-04-24 18:30:14 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-04-24 18:30:14 +0000 |
| commit | bcdb689b03b8acb5fc82d7d93ba3efa5babb480a (patch) | |
| tree | e142b9304cfb5ebb7b0d73d9b745e562655e925b /ext/Unicode | |
| parent | e4da7dce7048c59f69f6887c20a3c326dc4f2428 (diff) | |
| download | perl-bcdb689b03b8acb5fc82d7d93ba3efa5babb480a.tar.gz | |
Integrate #16136, #16137, #16138 from macperl;
Silly fix for the SC compiler's fixation with "comp" as a type
Skip more PerlIO symbols for sfio
Play nicely in miniperl
p4raw-id: //depot/perl@16142
p4raw-integrated: from //depot/macperl@16132 'copy in'
ext/Unicode/Normalize/Normalize.xs lib/File/Copy.pm
lib/File/Spec/Mac.pm makedef.pl (@16123..)
Diffstat (limited to 'ext/Unicode')
| -rw-r--r-- | ext/Unicode/Normalize/Normalize.xs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/Unicode/Normalize/Normalize.xs b/ext/Unicode/Normalize/Normalize.xs index 3cb221fd75..93cb471a5d 100644 --- a/ext/Unicode/Normalize/Normalize.xs +++ b/ext/Unicode/Normalize/Normalize.xs @@ -553,10 +553,10 @@ getComposite(uv, uv2) UV uv2 PROTOTYPE: $$ PREINIT: - UV comp; + UV composite; CODE: - comp = composite_uv(uv, uv2); - RETVAL = comp ? newSVuv(comp) : &PL_sv_undef; + composite = composite_uv(uv, uv2); + RETVAL = composite ? newSVuv(composite) : &PL_sv_undef; OUTPUT: RETVAL |