commit 42f1192273f3d05531c3fcfc8ce0fe5c437f6b7f
author Dan Albert <danalbert@google.com> Fri Mar 27 06:35:54 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 06:35:54 2015 +0000
tree c00e797113c50d2a1cf8ac1c882875320f68c70c
parent 5188d556d1530b3675dab2fc30dcc17432aa0718
parent 94d1360f7eacd52771fb7030b26aeb722a584bd5

Merge "Pull in Windows compatibility header."

base/logging.cpp

diff --git a/base/logging.cpp b/base/logging.cpp
index 8bfb204..38ee2af 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <limits>
+#include <mutex>
 #include <sstream>
 #include <string>
 #include <vector>

base/strings.cpp

diff --git a/base/strings.cpp b/base/strings.cpp
index 5f7eccc..6f698d9 100644
--- a/base/strings.cpp
+++ b/base/strings.cpp
@@ -17,6 +17,7 @@
 #include "base/strings.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <string>
 #include <vector>

include/utils/Compat.h

diff --git a/include/utils/Compat.h b/include/utils/Compat.h
index a238afe..ca4a8e0 100644
--- a/include/utils/Compat.h
+++ b/include/utils/Compat.h
@@ -36,7 +36,7 @@
 #endif /* __APPLE__ */
 
 #if defined(_WIN32)
-#define O_CLOEXEC 0
+#define O_CLOEXEC O_NOINHERIT
 #define O_NOFOLLOW 0
 #define DEFFILEMODE 0666
 #endif /* _WIN32 */