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/18 02:11:47 UTC
[12/12] mesos git commit: Windows: Add windows support to
`stout/protobuf.hpp`.
Windows: Add windows support to `stout/protobuf.hpp`.
Review: https://reviews.apache.org/r/39208
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e7201e36
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e7201e36
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e7201e36
Branch: refs/heads/master
Commit: e7201e36254c029b56747bf86ad61265f8b72c75
Parents: de387d6
Author: Alex Clemmer <cl...@gmail.com>
Authored: Sat Oct 17 17:49:47 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sat Oct 17 20:11:13 2015 -0400
----------------------------------------------------------------------
.../libprocess/3rdparty/stout/include/stout/protobuf.hpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e7201e36/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp
index 2285ce9..f0e7870 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp
@@ -17,7 +17,9 @@
#include <assert.h>
#include <errno.h>
#include <stdint.h>
+#ifndef __WINDOWS__
#include <unistd.h>
+#endif // __WINDOWS__
#include <sys/types.h>
@@ -36,11 +38,16 @@
#include <stout/error.hpp>
#include <stout/json.hpp>
#include <stout/none.hpp>
-#include <stout/os.hpp>
+#include <stout/nothing.hpp>
#include <stout/result.hpp>
#include <stout/stringify.hpp>
#include <stout/try.hpp>
+#include <stout/os/close.hpp>
+#include <stout/os/open.hpp>
+#include <stout/os/read.hpp>
+#include <stout/os/write.hpp>
+
namespace protobuf {
// TODO(bmahler): Re-use stout's 'recordio' facilities here. Note