From bbbb8297eab0db4dd4887c40aa5786a600dd6cf4 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 27 Jul 2003 01:37:28 +0000
Subject: [PATCH] 8.0 recognized + fix BOOST_NO_INTRINSIC_WCHAR_T for Windows

[SVN r19319]
---
 include/boost/config/compiler/intel.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 7aa72b4f..680f6e82 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -58,7 +58,9 @@
 #if BOOST_INTEL_CXX_VERSION < 700
 #  define BOOST_NO_INTRINSIC_WCHAR_T
 #else
-#  if defined(_WCHAR_T_DEFINED) && !defined(_WCHAR_T)
+// _WCHAR_T_DEFINED is the Win32 spelling
+// _WCHAR_T is the Linux spelling
+#  if !defined(_WCHAR_T_DEFINED) && !defined(_WCHAR_T)
 #    define BOOST_NO_INTRINSIC_WCHAR_T
 #  endif
 #endif
@@ -87,7 +89,7 @@
 #endif
 //
 // last known and checked version:
-#if (BOOST_INTEL_CXX_VERSION > 700)
+#if (BOOST_INTEL_CXX_VERSION > 800)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  elif defined(_MSC_VER)