From 4c07c442252bf59341635536ef96c58bd987c355 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 6 Apr 2011 17:21:44 +0000
Subject: [PATCH] Revert unnecessary changes.

[SVN r71036]
---
 include/boost/config/stdlib/dinkumware.hpp | 2 --
 include/boost/config/stdlib/libcpp.hpp     | 2 +-
 include/boost/config/stdlib/msl.hpp        | 2 --
 include/boost/config/stdlib/sgi.hpp        | 2 +-
 include/boost/config/stdlib/stlport.hpp    | 4 ++--
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp
index 4cf2cf05..33b56088 100644
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -86,12 +86,10 @@
 #  define BOOST_NO_STD_LOCALE
 #endif
 
-#ifdef __cplusplus
 #include <typeinfo>
 #if !_HAS_EXCEPTIONS
 #  define BOOST_NO_STD_TYPEINFO    
 #endif  
-#endif
 
 //  C++0x headers implemented in 520 (as shipped by Microsoft)
 //
diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp
index bc023474..07c70433 100644
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -8,7 +8,7 @@
 //  config for libc++
 //  Might need more in here later.
 
-#if !defined(_LIBCPP_VERSION) && defined(__cplusplus)
+#if !defined(_LIBCPP_VERSION)
 #  include <ciso646>
 #  if !defined(_LIBCPP_VERSION)
 #      error "This is not libc++!"
diff --git a/include/boost/config/stdlib/msl.hpp b/include/boost/config/stdlib/msl.hpp
index 902809d0..adb3d478 100644
--- a/include/boost/config/stdlib/msl.hpp
+++ b/include/boost/config/stdlib/msl.hpp
@@ -26,9 +26,7 @@
 #endif
 
 // check C lib version for <stdint.h>
-#ifdef __cplusplus
 #include <cstddef>
-#endif
 
 #if defined(__MSL__) && (__MSL__ >= 0x5000)
 #  define BOOST_HAS_STDINT_H
diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp
index bcf93cf4..c8d77d55 100644
--- a/include/boost/config/stdlib/sgi.hpp
+++ b/include/boost/config/stdlib/sgi.hpp
@@ -91,7 +91,7 @@
 //
 // If this is GNU libstdc++2, then no <limits> and no std::wstring:
 //
-#if (defined(__GNUC__) && (__GNUC__ < 3) && defined(__cplusplus))
+#if (defined(__GNUC__) && (__GNUC__ < 3))
 #  include <string>
 #  if defined(__BASTRING__)
 #     define BOOST_NO_LIMITS
diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp
index 9991b5e5..d3069992 100644
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -9,7 +9,7 @@
 
 //  STLPort standard library config:
 
-#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) && defined(__cplusplus)
+#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #  include <cstddef>
 #  if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
 #      error "This is not STLPort!"
@@ -203,7 +203,7 @@ namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy;
 //
 // gcc-2.95.3/STLPort does not like the using declarations we use to get ADL with std::min/max
 //
-#if defined(__GNUC__) && (__GNUC__ < 3) && defined(__cplusplus)
+#if defined(__GNUC__) && (__GNUC__ < 3)
 #  include <algorithm> // for std::min and std::max
 #  define BOOST_USING_STD_MIN() ((void)0)
 #  define BOOST_USING_STD_MAX() ((void)0)