You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/10/20 21:50:14 UTC
[3/8] mesos git commit: Windows: Added Windows support to
`process/socket.hpp`.
Windows: Added Windows support to `process/socket.hpp`.
Review: https://reviews.apache.org/r/39377
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/958117c3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/958117c3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/958117c3
Branch: refs/heads/master
Commit: 958117c3d6476ecc3bdf28d82458f14ac6caf9f7
Parents: ccac1ae
Author: Alex Clemmer <cl...@gmail.com>
Authored: Tue Oct 20 13:07:19 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Oct 20 13:11:18 2015 -0400
----------------------------------------------------------------------
3rdparty/libprocess/include/process/socket.hpp | 9 ++++++++-
3rdparty/libprocess/src/poll_socket.cpp | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/958117c3/3rdparty/libprocess/include/process/socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp
index 4b2597f..ebee789 100644
--- a/3rdparty/libprocess/include/process/socket.hpp
+++ b/3rdparty/libprocess/include/process/socket.hpp
@@ -15,6 +15,11 @@
#ifndef __PROCESS_SOCKET_HPP__
#define __PROCESS_SOCKET_HPP__
+#ifndef __WINDOWS__
+#include <sys/socket.h>
+#include <sys/wait.h>
+#endif // __WINDOWS__
+
#include <memory>
#include <process/address.hpp>
@@ -22,8 +27,10 @@
#include <stout/abort.hpp>
#include <stout/nothing.hpp>
-#include <stout/os.hpp>
#include <stout/try.hpp>
+#ifdef __WINDOWS__
+#include <stout/windows.hpp>
+#endif // __WINDOWS__
namespace process {
namespace network {
http://git-wip-us.apache.org/repos/asf/mesos/blob/958117c3/3rdparty/libprocess/src/poll_socket.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/poll_socket.cpp b/3rdparty/libprocess/src/poll_socket.cpp
index 28ed102..85cd864 100644
--- a/3rdparty/libprocess/src/poll_socket.cpp
+++ b/3rdparty/libprocess/src/poll_socket.cpp
@@ -18,6 +18,8 @@
#include <process/network.hpp>
#include <process/socket.hpp>
+#include <stout/os/sendfile.hpp>
+
#include "config.hpp"
#include "poll_socket.hpp"