diff options
| author | Carl Shapiro <cshapiro@google.com> | 2011-06-14 20:31:24 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2011-06-14 20:42:37 -0700 |
| commit | 375fb116bcb817b37509ab579dbd55cdbb765cbf (patch) | |
| tree | 8e033bfca03e94b0fc561f2bd6b94d5f8d11b0a3 /vm/compiler/codegen/x86 | |
| parent | 7baeded82e40352ebfb43b716e0b1dd752e72e7e (diff) | |
| download | android_dalvik-375fb116bcb817b37509ab579dbd55cdbb765cbf.tar.gz android_dalvik-375fb116bcb817b37509ab579dbd55cdbb765cbf.tar.bz2 android_dalvik-375fb116bcb817b37509ab579dbd55cdbb765cbf.zip | |
Normalize the include guard style.
An leading underscore followed by a capital letter is a reserved
name space in C and C++.
This change also moves any #include directives within the include
guard in some of the compiler/codegen/arm header files.
Change-Id: I9715e2c5301699d31886e61d0fe6e29483555a2a
Diffstat (limited to 'vm/compiler/codegen/x86')
| -rw-r--r-- | vm/compiler/codegen/x86/CalloutHelper.h | 8 | ||||
| -rw-r--r-- | vm/compiler/codegen/x86/X86LIR.h | 8 | ||||
| -rw-r--r-- | vm/compiler/codegen/x86/ia32/ArchVariant.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/vm/compiler/codegen/x86/CalloutHelper.h b/vm/compiler/codegen/x86/CalloutHelper.h index 52c030fea..3490f04a9 100644 --- a/vm/compiler/codegen/x86/CalloutHelper.h +++ b/vm/compiler/codegen/x86/CalloutHelper.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "Dalvik.h" +#ifndef DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H_ +#define DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H_ -#ifndef _DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H -#define _DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H +#include "Dalvik.h" /* * Declare/comment prototypes of all native callout functions invoked by the @@ -56,4 +56,4 @@ Object* dvmAllocObject(ClassObject* clazz, int flags); // OP_NEW_INSTANCE */ extern "C" double sqrt(double x); // INLINE_MATH_SQRT -#endif /* _DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H */ +#endif // DALVIK_VM_COMPILER_CODEGEN_X86_CALLOUT_HELPER_H_ diff --git a/vm/compiler/codegen/x86/X86LIR.h b/vm/compiler/codegen/x86/X86LIR.h index 19f08e1db..863aeabd2 100644 --- a/vm/compiler/codegen/x86/X86LIR.h +++ b/vm/compiler/codegen/x86/X86LIR.h @@ -14,12 +14,12 @@ * limitations under the License. */ +#ifndef DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H_ +#define DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H_ + #include "Dalvik.h" #include "compiler/CompilerInternals.h" -#ifndef _DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H -#define _DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H - /* * For both JIT & interpreter: * esi is Dalvik FP @@ -179,4 +179,4 @@ typedef struct X86LIR { #define CHAIN_CELL_NORMAL_SIZE 12 #define CHAIN_CELL_PREDICTED_SIZE 16 -#endif /* _DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H */ +#endif // DALVIK_VM_COMPILER_CODEGEN_X86_X86LIR_H_ diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.h b/vm/compiler/codegen/x86/ia32/ArchVariant.h index c5ce38e28..f1c21d32c 100644 --- a/vm/compiler/codegen/x86/ia32/ArchVariant.h +++ b/vm/compiler/codegen/x86/ia32/ArchVariant.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H -#define _DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H +#ifndef DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H_ +#define DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H_ /* Create the TemplateOpcode enum */ #define JIT_TEMPLATE(X) TEMPLATE_##X, @@ -31,4 +31,4 @@ enum TemplateOpcode { }; #undef JIT_TEMPLATE -#endif /* _DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H */ +#endif // DALVIK_VM_COMPILER_CODEGEN_X86_IA32_ARCHVARIANT_H_ |