Don't allow newline characters in document settings.

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

diff --git a/boost/boost/config/platform/hpux.hpp b/boost/boost/config/platform/hpux.hpp
index 879fa00bfd53ce5da1f32e0eb6d21a3fa4747dae..19ce68e59731b999828a6b0f54c2c0499b69c5db 100644 (file)
--- a/boost/boost/config/platform/hpux.hpp
+++ b/boost/boost/config/platform/hpux.hpp
@@ -2,7 +2,7 @@
 //  (C) Copyright Jens Maurer 2001 - 2003. 
 //  (C) Copyright David Abrahams 2002. 
 //  (C) Copyright Toon Knapen 2003. 
-//  (C) Copyright Boris Gubenko 2006.
+//  (C) Copyright Boris Gubenko 2006 - 2007.
 //  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)
@@ -23,6 +23,8 @@
 
 #if !(defined(__HP_aCC) || !defined(_INCLUDE__STDC_A1_SOURCE))
 #  define BOOST_NO_SWPRINTF
+#endif
+#if defined(__HP_aCC) && !defined(_INCLUDE__STDC_A1_SOURCE)
 #  define BOOST_NO_CWCTYPE
 #endif
 
@@ -35,6 +37,8 @@
 #     define BOOST_HAS_THREADS
 #     define BOOST_HAS_PTHREADS
 #  endif
+#elif defined(__HP_aCC) && !defined(BOOST_DISABLE_THREADS)
+#  define BOOST_HAS_PTHREADS
 #endif
 
 // boilerplate code:
@@ -70,7 +74,9 @@
 #  define BOOST_HAS_SIGACTION
 #endif
 #ifndef BOOST_HAS_NRVO 
-#  define BOOST_HAS_NRVO
+#  ifndef __parisc
+#    define BOOST_HAS_NRVO
+#  endif
 #endif
 #ifndef BOOST_HAS_LOG1P 
 #  define BOOST_HAS_LOG1P
@@ -79,4 +85,3 @@
 #  define BOOST_HAS_EXPM1
 #endif
 
-