summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen/x86/ia32/ArchVariant.h
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-05-05 00:01:58 -0700
committerBrian Carlstrom <bdc@google.com>2011-05-05 14:49:03 -0700
commitbbf31b58c50fb892423b7fef0d8c1093bd0c1a6c (patch)
treeda5cb21f3c53e2b67ef6046e722a15ac4db8da9e /vm/compiler/codegen/x86/ia32/ArchVariant.h
parent00ceb87d1c57ccee59966be4deef1292a049285c (diff)
parenta17fcc1899d097ee5e6722740d5a60ad3f0313e5 (diff)
downloadandroid_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/x86/ia32/ArchVariant.h')
-rw-r--r--vm/compiler/codegen/x86/ia32/ArchVariant.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.h b/vm/compiler/codegen/x86/ia32/ArchVariant.h
index e4eebf3b4..c5ce38e28 100644
--- a/vm/compiler/codegen/x86/ia32/ArchVariant.h
+++ b/vm/compiler/codegen/x86/ia32/ArchVariant.h
@@ -19,7 +19,7 @@
/* Create the TemplateOpcode enum */
#define JIT_TEMPLATE(X) TEMPLATE_##X,
-typedef enum {
+enum TemplateOpcode {
#include "../../../template/ia32/TemplateOpList.h"
/*
* For example,
@@ -28,7 +28,7 @@ typedef enum {
* ...
*/
TEMPLATE_LAST_MARK,
-} TemplateOpcode;
+};
#undef JIT_TEMPLATE
#endif /* _DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H */