diff options
| author | 2012-12-12 16:31:20 -0800 | |
|---|---|---|
| committer | 2012-12-12 16:31:20 -0800 | |
| commit | 761600567d73b23324ae0251e871c15d6849ffd8 (patch) | |
| tree | 4757cb01233394fa2e9c461a68fc37a35c12dabb /src/compiler_llvm/compiler_llvm.h | |
| parent | 89c41e5f2fa10e7b97698b9714bd4883a73132f0 (diff) | |
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
Diffstat (limited to 'src/compiler_llvm/compiler_llvm.h')
| -rw-r--r-- | src/compiler_llvm/compiler_llvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler_llvm/compiler_llvm.h b/src/compiler_llvm/compiler_llvm.h index 0867e566e9..9aa9791ee8 100644 --- a/src/compiler_llvm/compiler_llvm.h +++ b/src/compiler_llvm/compiler_llvm.h @@ -17,10 +17,10 @@ #ifndef ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ #define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ +#include "base/macros.h" #include "compiler.h" #include "dex_file.h" #include "instruction_set.h" -#include "macros.h" #include "object.h" #include "procedure_linkage_table.h" |