From 517bc9850c84ac24d44bf5487ee1f8c89dc5b1e5 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 1 Jun 2003 19:09:09 +0000
Subject: [PATCH] Better BOOST_NO_INTRINSIC_WCHAR_T fix from Pavel Vozenilek

[SVN r18643]
---
 include/boost/config/compiler/intel.hpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 2d022a1a..cfe13a30 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -55,10 +55,16 @@
 
 #endif
 
-#if _MSC_VER+0 >= 1000
-#  if !defined(_NATIVE_WCHAR_T_DEFINED) && !defined(_WCHAR_T_DEFINED)
-#     define BOOST_NO_INTRINSIC_WCHAR_T
+// See http://aspn.activestate.com/ASPN/Mail/Message/boost/1614864
+#if BOOST_INTEL_CXX_VERSION < 700
+#  define BOOST_NO_INTRINSIC_WCHAR_T
+#else
+#  ifndef _WCHAR_T_DEFINED
+#    define BOOST_NO_INTRINSIC_WCHAR_T
 #  endif
+#endif
+
+#if _MSC_VER+0 >= 1000
 #  if _MSC_VER >= 1200
 #     define BOOST_HAS_MS_INT64
 #  endif