From a2f958b60c61094d3a3f20fcbd95d854d48f59b5 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 28 Feb 2005 10:55:15 +0000
Subject: [PATCH] Anything that shares VC6's runtime has the same issues with
 setlocale that VC6 does.

[SVN r27516]
---
 test/regress/test_locale.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index c73329d5..1f1b49d5 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -156,7 +156,7 @@ void test_en_locale()
    // VC6 seems to have problems with std::setlocale, I've never
    // gotten to the bottem of this as the program runs fine under the
    // debugger, but hangs when run from bjam:
-#if !BOOST_WORKAROUND(BOOST_MSVC_, <=1200)
+#if !BOOST_WORKAROUND(BOOST_MSVC_, <=1200) && !(defined(__ICL) && defined(_MSC_VER) && (_MSC_VER == 1200))
    test_en_locale("en_US", 0x09 | 0x01 << 10);
    test_en_locale("en_UK", 0x09 | 0x02 << 10);
    test_en_locale("en", 0x09);