diff options
| author | Nicholas Clark <nick@ccl4.org> | 2005-11-09 21:30:02 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2005-11-09 21:30:02 +0000 |
| commit | a45f1ba014589f25fbf825289b49af1c5cc4f3ee (patch) | |
| tree | 869f77cda11172ff4a96a51f40a34877a9967c75 /t/io | |
| parent | ceb1aeda7d2a3a96426ccfbd724ec7c64f052923 (diff) | |
| download | perl-a45f1ba014589f25fbf825289b49af1c5cc4f3ee.tar.gz | |
I/O is UTF-8, not "UNICODE"
p4raw-id: //depot/perl@26066
Diffstat (limited to 't/io')
| -rw-r--r-- | t/io/layers.t | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/io/layers.t b/t/io/layers.t index 62f77e864a..c399b2ad8f 100644 --- a/t/io/layers.t +++ b/t/io/layers.t @@ -31,20 +31,20 @@ my $DOSISH = $^O =~ /^(?:MSWin32|os2|dos|NetWare|mint)$/ ? 1 : 0; $DOSISH = 1 if !$DOSISH and $^O =~ /^uwin/; my $NONSTDIO = exists $ENV{PERLIO} && $ENV{PERLIO} ne 'stdio' ? 1 : 0; my $FASTSTDIO = $Config{d_faststdio} && $Config{usefaststdio} ? 1 : 0; -my $UNICODE_STDIN; +my $UTF8_STDIN; if (${^UNICODE} & 1) { if (${^UNICODE} & 64) { # Conditional on the locale - $UNICODE_STDIN = ${^UTF8LOCALE}; + $UTF8_STDIN = ${^UTF8LOCALE}; } else { # Unconditional - $UNICODE_STDIN = 1; + $UTF8_STDIN = 1; } } else { - $UNICODE_STDIN = 0; + $UTF8_STDIN = 0; } my $NTEST = 44 - (($DOSISH || !$FASTSTDIO) ? 7 : 0) - ($DOSISH ? 5 : 0) - + $UNICODE_STDIN; + + $UTF8_STDIN; sub PerlIO::F_UTF8 () { 0x00008000 } # from perliol.h @@ -57,7 +57,7 @@ print <<__EOH__; # FASTSTDIO = $FASTSTDIO # UNICODE = ${^UNICODE} # UTF8LOCALE = ${^UTF8LOCALE} -# UNICODE_STDIN = $UNICODE_STDIN +# UTF8_STDIN = $UTF8_STDIN __EOH__ SKIP: { @@ -122,7 +122,7 @@ SKIP: { } check([ PerlIO::get_layers(STDIN) ], - $UNICODE_STDIN ? [ "stdio", "utf8" ] : [ "stdio" ], + $UTF8_STDIN ? [ "stdio", "utf8" ] : [ "stdio" ], "STDIN"); open(F, ">:crlf", "afile"); |