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/dex_instruction.h b/src/dex_instruction.h
index 48dbb0c..658e756 100644
--- a/src/dex_instruction.h
+++ b/src/dex_instruction.h
@@ -17,9 +17,9 @@
#ifndef ART_SRC_DEX_INSTRUCTION_H_
#define ART_SRC_DEX_INSTRUCTION_H_
+#include "base/macros.h"
#include "globals.h"
#include "logging.h"
-#include "macros.h"
namespace art {