Don't allow newline characters in document settings.

[lyx.git] / boost / boost / config / platform / macos.hpp

diff --git a/boost/boost/config/platform/macos.hpp b/boost/boost/config/platform/macos.hpp
index d6877d31127d295be537d3da18fb2c929e746550..6d876b12db3849ba3a27ba22959574d3127be277 100644 (file)
--- a/boost/boost/config/platform/macos.hpp
+++ b/boost/boost/config/platform/macos.hpp
@@ -47,6 +47,14 @@
 #    define BOOST_NO_STDC_NAMESPACE
 #  endif
 
+#  if (__GNUC__ == 4)
+
+// Both gcc and intel require these.  
+#    define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#    define BOOST_HAS_NANOSLEEP
+
+#  endif
+
 #else
 
 // Using the MSL C library.
@@ -56,16 +64,17 @@
 #  if ( defined(TARGET_API_MAC_CARBON) && TARGET_API_MAC_CARBON ) || ( defined(TARGET_CARBON) && TARGET_CARBON )
 
 #  if !defined(BOOST_HAS_PTHREADS)
-#    define BOOST_HAS_MPTASKS
+// MPTasks support is deprecated/removed from Boost:
+//#    define BOOST_HAS_MPTASKS
 #  elif ( __dest_os == __mac_os_x )
 // We are doing a Carbon/Mach-O/MSL build which has pthreads, but only the
 // gettimeofday and no posix.
 #  define BOOST_HAS_GETTIMEOFDAY
 #  endif
 
-// The MP task implementation of Boost Threads aims to replace MP-unsafe
-// parts of the MSL, so we turn on threads unconditionally.
-#    define BOOST_HAS_THREADS
+#ifdef BOOST_HAS_PTHREADS
+#  define BOOST_HAS_THREADS
+#endif
 
 // The remote call manager depends on this.
 #    define BOOST_BIND_ENABLE_PASCAL