diff options
| author | Steve Hay <SteveHay@planit.com> | 2007-06-28 10:46:39 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2007-06-28 10:46:39 +0000 |
| commit | 3a2d17640c711a74da5a32d6750db585e6944152 (patch) | |
| tree | 3e55e58971272b0ca59ceadbc1a20fdd96b1957c | |
| parent | 9fb265f7d587e571375a3a5fdb05c24fd9d10d91 (diff) | |
| download | perl-3a2d17640c711a74da5a32d6750db585e6944152.tar.gz | |
Re-enable the setlocale() tests for Windows XP onwards
since they seem to work OK. Not sure about older flavours
of Windows, so leave them alone.
p4raw-id: //depot/perl@31491
| -rw-r--r-- | lib/locale.t | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/locale.t b/lib/locale.t index c3a9d945b9..783d0bd9dc 100644 --- a/lib/locale.t +++ b/lib/locale.t @@ -43,7 +43,12 @@ eval { # Visual C's CRT goes silly on strings of the form "en_US.ISO8859-1" # and mingw32 uses said silly CRT -$have_setlocale = 0 if (($^O eq 'MSWin32' || $^O eq 'NetWare') && $Config{cc} =~ /^(cl|gcc)/i); +# This doesn't seem to be an issue any more, at least on Windows XP, +# so re-enable the tests for Windows XP onwards. +my $winxp = ($^O eq 'MSWin32' && defined &Win32::GetOSVersion && + join('.', (Win32::GetOSVersion())[1..2]) >= 5.1); +$have_setlocale = 0 if ((($^O eq 'MSWin32' && !$winxp) || $^O eq 'NetWare') && + $Config{cc} =~ /^(cl|gcc)/i); # UWIN seems to loop after test 98, just skip for now $have_setlocale = 0 if ($^O =~ /^uwin/); |