commit 0722bae7892cc7ce9f056138ad38dfaec38bf5de
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 10:46:43 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 10:46:43 2015 +0000
tree 54d1196083e2e4dc4b53353a2a77be6abd265066
parent 7fbdaddfac55c8c10d1595313f436221e77211f6

Revert "Add commonly used C++ macros to libbase."

Breaks master build.

This reverts commit 7fbdaddfac55c8c10d1595313f436221e77211f6.

Change-Id: I53d090f7dee8ed30fc49d908939153996cdb2298

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 118071e..773f33b 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -23,9 +23,9 @@
 
 #include <string>
 
-#include "base/macros.h"  // For TEMP_FAILURE_RETRY on Darwin.
 #define LOG_TAG "base.file"
 #include "cutils/log.h"
+#include "utils/Compat.h"  // For TEMP_FAILURE_RETRY on Darwin.
 
 namespace android {
 namespace base {