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 /libnativehelper | |
| 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 'libnativehelper')
| -rw-r--r-- | libnativehelper/include/nativehelper/JNIHelp.h | 6 | ||||
| -rw-r--r-- | libnativehelper/include/nativehelper/jni.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libnativehelper/include/nativehelper/JNIHelp.h b/libnativehelper/include/nativehelper/JNIHelp.h index c45445c6a..aa98c2c95 100644 --- a/libnativehelper/include/nativehelper/JNIHelp.h +++ b/libnativehelper/include/nativehelper/JNIHelp.h @@ -20,8 +20,8 @@ * This file may be included by C or C++ code, which is trouble because jni.h * uses different typedefs for JNIEnv in each language. */ -#ifndef _NATIVEHELPER_JNIHELP_H -#define _NATIVEHELPER_JNIHELP_H +#ifndef NATIVEHELPER_JNIHELP_H_ +#define NATIVEHELPER_JNIHELP_H_ #include "jni.h" #include "cutils/log.h" @@ -189,4 +189,4 @@ inline void jniLogException(JNIEnv* env, int priority, const char* tag, jthrowab _rc; }) #endif -#endif /*_NATIVEHELPER_JNIHELP_H*/ +#endif /* NATIVEHELPER_JNIHELP_H_ */ diff --git a/libnativehelper/include/nativehelper/jni.h b/libnativehelper/include/nativehelper/jni.h index 22b1d883f..b71cf6141 100644 --- a/libnativehelper/include/nativehelper/jni.h +++ b/libnativehelper/include/nativehelper/jni.h @@ -21,8 +21,8 @@ * Everything here is expected to be VM-neutral. */ -#ifndef _JNI_H -#define _JNI_H +#ifndef JNI_H_ +#define JNI_H_ #include <stdarg.h> @@ -1152,4 +1152,4 @@ void JNI_OnUnload(JavaVM* vm, void* reserved); #define JNIEXPORT #define JNICALL -#endif /*_JNI_H*/ +#endif /* JNI_H_ */ |
