Switch over to the google3 unix_file File*.
I also moved macros.h to base/macros.h to ease google3 porting, at
the expense of a larger than necessary change. (I learned my lesson,
though, and didn't make the equivalent base/logging.h change.)
I'm not sure whether we want to keep the unix_file MappedFile given
our existing MemMap, but it's easier to bring it over and then remove
it (and possibly revert the removal) than to bring it over later.
Change-Id: Id50a66faa5ab17b9bc936cc9043dbc26f791f0ca
diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc
index d5231ec..f57d615 100644
--- a/src/gc/mark_sweep.cc
+++ b/src/gc/mark_sweep.cc
@@ -22,6 +22,7 @@
#include <vector>
#include "barrier.h"
+#include "base/macros.h"
#include "card_table.h"
#include "class_loader.h"
#include "dex_cache.h"
@@ -31,7 +32,6 @@
#include "jni_internal.h"
#include "large_object_space.h"
#include "logging.h"
-#include "macros.h"
#include "monitor.h"
#include "object.h"
#include "runtime.h"