Ticket #2958: boost_1_38_0.asio.vxworks.patch

boost/asio/detail/descriptor_ops.hpp

@@ -50 +50 @@
 inline int open(const char* path, int flags, boost::system::error_code& ec)
 {
   clear_error(ec);
+#if defined(__VXWORKS__) && defined(_WRS_KERNEL)
+  return error_wrapper(::open(path, flags, 0), ec);
+#else
   return error_wrapper(::open(path, flags), ec);
+#endif
 }
 
 inline int close(int d, boost::system::error_code& ec)
@@ -95 +99 @@
     boost::system::error_code& ec)
 {
   clear_error(ec);
+#if defined(__VXWORKS__)
+  return error_wrapper(::writev(d, const_cast<buf*>(bufs), static_cast<int>(count)), ec);
+#else
   return error_wrapper(::writev(d, bufs, static_cast<int>(count)), ec);
+#endif
 }
 
 inline int ioctl(int d, long cmd, ioctl_arg_type* arg,
     boost::system::error_code& ec)
 {
   clear_error(ec);
+#if defined(__VXWORKS__) && defined(_WRS_KERNEL)
+  return error_wrapper(::ioctl(d, cmd, (int)arg), ec);
+#else
   return error_wrapper(::ioctl(d, cmd, arg), ec);
+#endif
 }
 
 inline int fcntl(int d, long cmd, boost::system::error_code& ec)

boost/asio/detail/pipe_select_interrupter.hpp

@@ -23 +23 @@
 #include <boost/system/system_error.hpp>
 #include <boost/asio/detail/pop_options.hpp>
 
-#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
+#if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) && !defined(__VXWORKS__)
 
 #include <boost/asio/detail/push_options.hpp>
 #include <fcntl.h>

boost/asio/detail/select_interrupter.hpp

@@ -29 +29 @@
 namespace asio {
 namespace detail {
 
-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__VXWORKS__)
 typedef socket_select_interrupter select_interrupter;
 #elif defined(BOOST_ASIO_HAS_EVENTFD)
 typedef eventfd_select_interrupter select_interrupter;

boost/asio/detail/socket_ops.hpp

@@ -40 +40 @@
 struct msghdr { int msg_namelen; };
 #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
 
+#if defined(__VXWORKS__)
+  // vxworks has strange function definitions, uses int instead of socklen_t (which is unsigned)
+# define SockLenTypeImpl int
+#else
+# define SockLenTypeImpl SockLenType
+#endif
+
+
 #if defined(__hpux)
 // HP-UX doesn't declare these functions extern "C", so they are declared again
 // here to avoid linker errors about undefined symbols.
@@ -75 +83 @@
 inline socket_type call_accept(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
-  SockLenType tmp_addrlen = addrlen ? (SockLenType)*addrlen : 0;
+  SockLenTypeImpl tmp_addrlen = addrlen ? (SockLenTypeImpl)*addrlen : 0;
   socket_type result = ::accept(s, addr, addrlen ? &tmp_addrlen : 0);
   if (addrlen)
     *addrlen = (std::size_t)tmp_addrlen;
@@ -114 +122 @@
 inline int call_bind(SockLenType msghdr::*,
     socket_type s, const socket_addr_type* addr, std::size_t addrlen)
 {
-  return ::bind(s, addr, (SockLenType)addrlen);
+  return ::bind(s, const_cast<socket_addr_type*>(addr), (SockLenTypeImpl)addrlen);
 }
 
 inline int bind(socket_type s, const socket_addr_type* addr,
@@ -158 +166 @@
 inline int call_connect(SockLenType msghdr::*,
     socket_type s, const socket_addr_type* addr, std::size_t addrlen)
 {
-  return ::connect(s, addr, (SockLenType)addrlen);
+  return ::connect(s, const_cast<socket_addr_type*>(addr), (SockLenTypeImpl)addrlen);
 }
 
 inline int connect(socket_type s, const socket_addr_type* addr,
@@ -177 +185 @@
 inline int socketpair(int af, int type, int protocol,
     socket_type sv[2], boost::system::error_code& ec)
 {
-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__VXWORKS__)
   (void)(af);
   (void)(type);
   (void)(protocol);
@@ -418 +426 @@
     socket_type s, int level, int optname,
     const void* optval, std::size_t optlen)
 {
+#if defined(__VXWORKS__)
   return ::setsockopt(s, level, optname,
-      (const char*)optval, (SockLenType)optlen);
+      (char*)optval, (SockLenTypeImpl)optlen);
+#else
+  return ::setsockopt(s, level, optname,
+      (const char*)optval, (SockLenTypeImpl)optlen);
+#endif // defined(__VXWORKS__)
 }
 
 inline int setsockopt(socket_type s, int level, int optname,
@@ -465 +478 @@
     socket_type s, int level, int optname,
     void* optval, std::size_t* optlen)
 {
-  SockLenType tmp_optlen = (SockLenType)*optlen;
+  SockLenTypeImpl tmp_optlen = (SockLenTypeImpl)*optlen;
   int result = ::getsockopt(s, level, optname, (char*)optval, &tmp_optlen);
   *optlen = (std::size_t)tmp_optlen;
   return result;
@@ -552 +565 @@
 inline int call_getpeername(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
-  SockLenType tmp_addrlen = (SockLenType)*addrlen;
+  SockLenTypeImpl tmp_addrlen = (SockLenTypeImpl)*addrlen;
   int result = ::getpeername(s, addr, &tmp_addrlen);
   *addrlen = (std::size_t)tmp_addrlen;
   return result;
@@ -575 +588 @@
 inline int call_getsockname(SockLenType msghdr::*,
     socket_type s, socket_addr_type* addr, std::size_t* addrlen)
 {
-  SockLenType tmp_addrlen = (SockLenType)*addrlen;
+  SockLenTypeImpl tmp_addrlen = (SockLenTypeImpl)*addrlen;
   int result = ::getsockname(s, addr, &tmp_addrlen);
   *addrlen = (std::size_t)tmp_addrlen;
   return result;
@@ -603 +616 @@
   if (result == 0)
     clear_error(ec);
   return result;
-#else // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#elif defined(__VXWORKS__) && defined(_WRS_KERNEL)
+  return error_wrapper(::ioctl(s, cmd, (int)arg), ec);
+#else // defined(__VXWORKS__)
   return error_wrapper(::ioctl(s, cmd, arg), ec);
-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+#endif
 }
 
 inline int select(int nfds, fd_set* readfds, fd_set* writefds,

boost/asio/detail/socket_types.hpp

@@ -92 +92 @@
 #  endif // defined(_MSC_VER) || defined(__BORLANDC__)
 # endif // !defined(BOOST_ASIO_NO_DEFAULT_LINKED_LIBS)
 # include <boost/asio/detail/old_win_sdk_compat.hpp>
+#elif defined(__VXWORKS__)
+# include <sys/ioctl.h>
+# include <poll.h>
+# include <sys/types.h>
+# include <selectLib.h>
+# include <sys/socket.h>
+# include <sockLib.h>
+# include <ioLib.h>
+# include <hostLib.h>
+# include <net/uio.h>
+# include <sys/un.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
+# include <arpa/inet.h>
+# include <netdb.h>
+# include <net/if.h>
+# include <limits.h>
+// vxworks has some really braindead macros defined
+#ifdef m_flags
+#       undef m_flags
+#endif
+#ifdef m_data
+#       undef m_data
+#endif
+
 #else
 # include <sys/ioctl.h>
 # include <sys/poll.h>