From 761600567d73b23324ae0251e871c15d6849ffd8 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 12 Dec 2012 16:31:20 -0800 Subject: 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 --- src/compiler_llvm/compiler_llvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/compiler_llvm/compiler_llvm.h') 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" -- cgit v1.2.3-59-g8ed1b