[Boost-commit] svn:boost r66014 - in trunk/boost/asio/detail: . impl

Subject: [Boost-commit] svn:boost r66014 - in trunk/boost/asio/detail: . impl
From: chris_at_[hidden]
Date: 2010-10-16 07:39:18

Author: chris_kohlhoff
Date: 2010-10-16 07:39:13 EDT (Sat, 16 Oct 2010)
New Revision: 66014
URL: http://svn.boost.org/trac/boost/changeset/66014

Log:
Always use pselect() on HP-UX, if it is available. Refs #4578.

Text files modified: 
   trunk/boost/asio/detail/impl/socket_ops.ipp |     2 +-                                      
   trunk/boost/asio/detail/socket_types.hpp    |     5 +++--                                   
   2 files changed, 4 insertions(+), 3 deletions(-)

Modified: trunk/boost/asio/detail/impl/socket_ops.ipp
==============================================================================
--- trunk/boost/asio/detail/impl/socket_ops.ipp	(original)
+++ trunk/boost/asio/detail/impl/socket_ops.ipp	2010-10-16 07:39:13 EDT (Sat, 16 Oct 2010)
@@ -1483,7 +1483,7 @@
     timeout->tv_usec = 1000;
 #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
 
-#if defined(__hpux) && defined(__HP_aCC)
+#if defined(__hpux) && defined(__SELECT)
   timespec ts;
   ts.tv_sec = timeout ? timeout->tv_sec : 0;
   ts.tv_nsec = timeout ? timeout->tv_usec * 1000 : 0;

Modified: trunk/boost/asio/detail/socket_types.hpp
==============================================================================
--- trunk/boost/asio/detail/socket_types.hpp	(original)
+++ trunk/boost/asio/detail/socket_types.hpp	2010-10-16 07:39:13 EDT (Sat, 16 Oct 2010)
@@ -52,9 +52,10 @@
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <fcntl.h>
-# if defined(__hpux) && !defined(__HP_aCC)
+# if defined(__hpux)
 #  include <sys/time.h>
-# else
+# endif
+# if !defined(__hpux) || defined(__SELECT)
 #  include <sys/select.h>
 # endif
 # include <sys/socket.h>