[Boost-commit] svn:boost r76323 - trunk/boost/detail

Subject: [Boost-commit] svn:boost r76323 - trunk/boost/detail
From: john_at_[hidden]
Date: 2012-01-05 12:29:22

Author: johnmaddock
Date: 2012-01-05 12:29:22 EST (Thu, 05 Jan 2012)
New Revision: 76323
URL: http://svn.boost.org/trac/boost/changeset/76323

Log:
Fix Clang workaround.
Fixes #6156.
Text files modified: 
   trunk/boost/detail/fenv.hpp |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 deletions(-)

Modified: trunk/boost/detail/fenv.hpp
==============================================================================
--- trunk/boost/detail/fenv.hpp	(original)
+++ trunk/boost/detail/fenv.hpp	2012-01-05 12:29:22 EST (Thu, 05 Jan 2012)
@@ -16,9 +16,10 @@
 
 /* If we're using clang + glibc, we have to get hacky. 
  * See http://llvm.org/bugs/show_bug.cgi?id=6907 */
-#if defined(__clang__)       &&                       \
+#if defined(__clang__)       &&  (__clang_major__ < 3) &&    \
     defined(__GNU_LIBRARY__) && /* up to version 5 */ \
-    defined(__GLIBC__)          /* version 6 + */
+    defined(__GLIBC__) &&         /* version 6 + */ \
+    !defined(_FENV_H)
   #define _FENV_H
 
   #include <features.h>