Don't allow newline characters in document settings.

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

diff --git a/boost/boost/config/platform/solaris.hpp b/boost/boost/config/platform/solaris.hpp
index 3a21a5ea15d547ae8d2236312834abe12dac4450..9f9256664bd49ebbb2408a198808fad66f9f7fb1 100644 (file)
--- a/boost/boost/config/platform/solaris.hpp
+++ b/boost/boost/config/platform/solaris.hpp
@@ -1,7 +1,8 @@
-//  (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
+//  (C) Copyright John Maddock 2001 - 2003. 
+//  (C) Copyright Jens Maurer 2003. 
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for most recent version.
 
@@ -15,5 +16,13 @@
 #define BOOST_HAS_UNISTD_H
 #include <boost/config/posix_features.hpp>
 
+//
+// pthreads don't actually work with gcc unless _PTHREADS is defined:
+//
+#if defined(__GNUC__) && defined(_POSIX_THREADS) && !defined(_PTHREADS)
+# undef BOOST_HAS_PTHREADS
+#endif
+
+