mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [07/12] mesos git commit: Windows: Enabled ip_tests.
Date Sun, 18 Oct 2015 00:11:42 GMT
Windows: Enabled ip_tests.

Review: https://reviews.apache.org/r/39182


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bc27f7f9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bc27f7f9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bc27f7f9

Branch: refs/heads/master
Commit: bc27f7f9198f2f69cbeba8ea7af7e2b33b051d5f
Parents: 24f555b
Author: Alex Clemmer <clemmer.alexander@gmail.com>
Authored: Sat Oct 17 17:26:08 2015 -0400
Committer: Joris Van Remoortere <joris.van.remoortere@gmail.com>
Committed: Sat Oct 17 20:11:13 2015 -0400

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp | 4 +---
 3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp       | 4 +---
 3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp  | 5 +++++
 3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/bc27f7f9/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
index 9055154..e58ee43 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
@@ -18,9 +18,7 @@
 #include <limits.h> // For 'LLONG_(MAX|MIN)'.
 
 // For 'timeval'.
-#ifdef __WINDOWS__
-#include <Winsock2.h>
-#else
+#ifndef __WINDOWS__
 #include <time.h>
 #endif // __WINDOWS__
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/bc27f7f9/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp
index d1e2df6..dc7c652 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp
@@ -15,9 +15,7 @@
 #define __STOUT_IP_HPP__
 
 // For 'sockaddr'.
-#ifdef __WINDOWS__
-#include <Winsock2.h>
-#else
+#ifndef __WINDOWS__
 #include <arpa/inet.h>
 #endif // __WINDOWS__
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/bc27f7f9/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
index 477c5d2..2d02d35 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/windows.hpp
@@ -15,8 +15,13 @@
 #define __STOUT_WINDOWS_HPP__
 
 
+#include <direct.h> // For `_mkdir`.
 #include <fcntl.h>  // For file access flags like `_O_CREAT`.
+#include <io.h>     // For `_read`, `_write`.
 
+// We include `Winsock2.h` before `Windows.h` explicitly to avoid symbold
+// re-definitions. This is a known pattern in the windows community.
+#include <Winsock2.h>
 #include <Windows.h>
 
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/bc27f7f9/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
index 0020715..26e1377 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/stout/tests/CMakeLists.txt
@@ -27,6 +27,7 @@ set(STOUT_TESTS_SRC
   hashmap_tests.cpp
   hashset_tests.cpp
   interval_tests.cpp
+  ip_tests.cpp
   json_tests.cpp
   linkedhashmap_tests.cpp
   main.cpp
@@ -49,7 +50,6 @@ if (NOT WIN32)
     dynamiclibrary_tests.cpp
     flags_tests.cpp
     gzip_tests.cpp
-    ip_tests.cpp
     mac_tests.cpp
     os_tests.cpp
     path_tests.cpp


Mime
View raw message