commit 76d9cad62c19eef99b61f95d3a7c256804c6ad80
author Dan Albert <danalbert@google.com> Mon Mar 16 10:09:07 2015 -0700
committer Dan Albert <danalbert@google.com> Mon Mar 16 10:09:07 2015 -0700
tree 7cb0612ba1b38334c175a9b866edec37034dad9a
parent c007bc3856a4cf86b8f610eb045f26a9dedc2894

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

This reverts commit 0722bae7892cc7ce9f056138ad38dfaec38bf5de.

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 773f33b..118071e 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 {