Update of /cvsroot/boost/boost/boost/asio/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29837
Modified Files:
socket_ops.hpp kqueue_reactor.hpp
Log Message:
Add support for compiling on Mac OS X 10.3.
Index: socket_ops.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/socket_ops.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- socket_ops.hpp 14 Jun 2006 22:26:31 -0000 1.1
+++ socket_ops.hpp 5 Jul 2006 05:26:35 -0000 1.2
@@ -24,6 +24,9 @@
#include <cerrno>
#include <boost/detail/workaround.hpp>
#include <new>
+#if defined(__MACH__) && defined(__APPLE__)
+# include <AvailabilityMacros.h>
+#endif // defined(__MACH__) && defined(__APPLE__)
#include <boost/asio/detail/pop_options.hpp>
#include <boost/asio/error.hpp>
@@ -190,7 +193,12 @@
return bytes_transferred;
#else // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
msghdr msg;
+#if defined(__MACH__) && defined(__APPLE__) \
+ && (MAC_OS_X_VERSION_MAX_ALLOWED < 1040)
+ msg.msg_name = reinterpret_cast<char*>(addr);
+#else
msg.msg_name = addr;
+#endif
msg.msg_namelen = *addrlen;
msg.msg_iov = bufs;
msg.msg_iovlen = count;
@@ -247,7 +255,12 @@
return bytes_transferred;
#else // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
msghdr msg;
+#if defined(__MACH__) && defined(__APPLE__) \
+ && (MAC_OS_X_VERSION_MAX_ALLOWED < 1040)
+ msg.msg_name = reinterpret_cast<char*>(const_cast<socket_addr_type*>(addr));
+#else
msg.msg_name = const_cast<socket_addr_type*>(addr);
+#endif
msg.msg_namelen = addrlen;
msg.msg_iov = const_cast<buf*>(bufs);
msg.msg_iovlen = count;
Index: kqueue_reactor.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/kqueue_reactor.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kqueue_reactor.hpp 14 Jun 2006 22:26:31 -0000 1.1
+++ kqueue_reactor.hpp 5 Jul 2006 05:26:35 -0000 1.2
@@ -45,6 +45,11 @@
#include <boost/asio/detail/signal_blocker.hpp>
#include <boost/asio/detail/socket_types.hpp>
+// Older versions of Mac OS X may not define EV_OOBAND.
+#if !defined(EV_OOBAND)
+# define EV_OOBAND EV_FLAG1
+#endif // !defined(EV_OOBAND)
+
namespace boost {
namespace asio {
namespace detail {
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs