diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-05-05 00:01:58 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-05-05 14:49:03 -0700 |
| commit | bbf31b58c50fb892423b7fef0d8c1093bd0c1a6c (patch) | |
| tree | da5cb21f3c53e2b67ef6046e722a15ac4db8da9e /vm/compiler/codegen/arm/armv7-a/ArchVariant.h | |
| parent | 00ceb87d1c57ccee59966be4deef1292a049285c (diff) | |
| parent | a17fcc1899d097ee5e6722740d5a60ad3f0313e5 (diff) | |
| download | android_dalvik-bbf31b58c50fb892423b7fef0d8c1093bd0c1a6c.tar.gz android_dalvik-bbf31b58c50fb892423b7fef0d8c1093bd0c1a6c.tar.bz2 android_dalvik-bbf31b58c50fb892423b7fef0d8c1093bd0c1a6c.zip | |
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Change-Id: I99c4289bd34f63b0b970b6ed0fa992b44e805393
Diffstat (limited to 'vm/compiler/codegen/arm/armv7-a/ArchVariant.h')
| -rw-r--r-- | vm/compiler/codegen/arm/armv7-a/ArchVariant.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.h b/vm/compiler/codegen/arm/armv7-a/ArchVariant.h index fa0121057..66e236b73 100644 --- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.h +++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV5TE_VFP_ARCHVARIANT_H -#define _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV5TE_VFP_ARCHVARIANT_H +#ifndef _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV7_A_ARCHVARIANT_H +#define _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV7_A_ARCHVARIANT_H /* Create the TemplateOpcode enum */ #define JIT_TEMPLATE(X) TEMPLATE_##X, -typedef enum { +enum TemplateOpcode { #include "../../../template/armv5te-vfp/TemplateOpList.h" /* * For example, @@ -28,7 +28,7 @@ typedef enum { * ... */ TEMPLATE_LAST_MARK, -} TemplateOpcode; +}; #undef JIT_TEMPLATE -#endif /* _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV5TE_VFP_ARCHVARIANT_H */ +#endif /* _DALVIK_VM_COMPILER_CODEGEN_ARM_ARMV7_A_ARCHVARIANT_H */ |