Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r66833 - trunk/boost/config/stdlib
From: admin_at_[hidden]
Date: 2010-11-28 19:22:16


Author: wash
Date: 2010-11-28 19:22:13 EST (Sun, 28 Nov 2010)
New Revision: 66833
URL: http://svn.boost.org/trac/boost/changeset/66833

Log:
Fix unistd.h include guards.

Text files modified:
   trunk/boost/config/stdlib/libstdcpp3.hpp | 8 +++++++-
   trunk/boost/config/stdlib/sgi.hpp | 8 +++++++-
   trunk/boost/config/stdlib/stlport.hpp | 8 +++++++-
   trunk/boost/config/stdlib/vacpp.hpp | 8 +++++++-
   4 files changed, 28 insertions(+), 4 deletions(-)

Modified: trunk/boost/config/stdlib/libstdcpp3.hpp
==============================================================================
--- trunk/boost/config/stdlib/libstdcpp3.hpp (original)
+++ trunk/boost/config/stdlib/libstdcpp3.hpp 2010-11-28 19:22:13 EST (Sun, 28 Nov 2010)
@@ -62,7 +62,13 @@
 # undef BOOST_HAS_LONG_LONG
 #endif
 
-#if !defined(CYGWIN)
+// Apple doesn't seem to reliably defined a *unix* macro
+#if !defined(CYGWIN) && ( defined(__unix__) \
+ || defined(__unix) \
+ || defined(unix) \
+ || defined(__APPLE__) \
+ || defined(__APPLE) \
+ || defined(APPLE)
 # include <unistd.h>
 #endif
 

Modified: trunk/boost/config/stdlib/sgi.hpp
==============================================================================
--- trunk/boost/config/stdlib/sgi.hpp (original)
+++ trunk/boost/config/stdlib/sgi.hpp 2010-11-28 19:22:13 EST (Sun, 28 Nov 2010)
@@ -40,7 +40,13 @@
 # define BOOST_NO_STRINGSTREAM
 #endif
 
-#if !defined(CYGWIN)
+// Apple doesn't seem to reliably defined a *unix* macro
+#if !defined(CYGWIN) && ( defined(__unix__) \
+ || defined(__unix) \
+ || defined(unix) \
+ || defined(__APPLE__) \
+ || defined(__APPLE) \
+ || defined(APPLE)
 # include <unistd.h>
 #endif
 

Modified: trunk/boost/config/stdlib/stlport.hpp
==============================================================================
--- trunk/boost/config/stdlib/stlport.hpp (original)
+++ trunk/boost/config/stdlib/stlport.hpp 2010-11-28 19:22:13 EST (Sun, 28 Nov 2010)
@@ -16,7 +16,13 @@
 # endif
 #endif
 
-#if !defined(CYGWIN)
+// Apple doesn't seem to reliably defined a *unix* macro
+#if !defined(CYGWIN) && ( defined(__unix__) \
+ || defined(__unix) \
+ || defined(unix) \
+ || defined(__APPLE__) \
+ || defined(__APPLE) \
+ || defined(APPLE)
 # include <unistd.h>
 #endif
 

Modified: trunk/boost/config/stdlib/vacpp.hpp
==============================================================================
--- trunk/boost/config/stdlib/vacpp.hpp (original)
+++ trunk/boost/config/stdlib/vacpp.hpp 2010-11-28 19:22:13 EST (Sun, 28 Nov 2010)
@@ -12,7 +12,13 @@
 #define BOOST_HAS_MACRO_USE_FACET
 #define BOOST_NO_STD_MESSAGES
 
-#if !defined(CYGWIN)
+// Apple doesn't seem to reliably defined a *unix* macro
+#if !defined(CYGWIN) && ( defined(__unix__) \
+ || defined(__unix) \
+ || defined(unix) \
+ || defined(__APPLE__) \
+ || defined(__APPLE) \
+ || defined(APPLE)
 # include <unistd.h>
 #endif
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk