commit fa74e4de5cc3d54a183f7c827f65810c0a3bf1be
author Elliott Hughes <enh@google.com> Thu Mar 03 22:10:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 03 22:10:06 2016 +0000
tree 188248fcaa953565f40e2ff6239ce556f60ba0de
parent 947c33400de2a29642db6f666dc21b3063b572c5
parent 4b74ad396618d1e9d87b71f5fb890ee63c40831a

Merge "Revert "Introduce unique_fd"" into nyc-dev
am: 263d140895

* commit '263d140895f0e61cda27301a21e4ce18651d4eb4':
  Revert "Introduce unique_fd"

file.cpp

diff --git a/file.cpp b/file.cpp
index bcdfc5e..da1adba 100644
--- a/file.cpp
+++ b/file.cpp
@@ -29,10 +29,6 @@
 #include "cutils/log.h"
 #include "utils/Compat.h"
 
-#if !defined(_WIN32)
-#define O_BINARY 0
-#endif
-
 namespace android {
 namespace base {
 

include/android-base/file.h

diff --git a/include/android-base/file.h b/include/android-base/file.h
index 486befc..5342d98 100644
--- a/include/android-base/file.h
+++ b/include/android-base/file.h
@@ -20,6 +20,10 @@
 #include <sys/stat.h>
 #include <string>
 
+#if !defined(_WIN32) && !defined(O_BINARY)
+#define O_BINARY 0
+#endif
+
 namespace android {
 namespace base {
 

test_utils.cpp

diff --git a/test_utils.cpp b/test_utils.cpp
index 337ba7c..635af6c 100644
--- a/test_utils.cpp
+++ b/test_utils.cpp
@@ -16,7 +16,6 @@
 
 #include "android-base/logging.h"
 #include "android-base/test_utils.h"
-#include "utils/Compat.h" // For OS_PATH_SEPARATOR.
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -27,6 +26,9 @@
 #if defined(_WIN32)
 #include <windows.h>
 #include <direct.h>
+#define OS_PATH_SEPARATOR '\\'
+#else
+#define OS_PATH_SEPARATOR '/'
 #endif
 
 #include <string>