merge in nyc-release history after reset to nyc-dev
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 {
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 {