commit 1ff7a0d91493dbf01bceba5fb28ce80ddac21708
author Carl Shapiro <cshapiro@google.com> Tue Jun 14 20:31:24 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Tue Jun 14 20:42:37 2011 -0700
tree 8f6be26550ee79254dfe53932bed923d1128704e
parent a6f951cbffc9ba9b906b5995958396402d0a32ab

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

include/nativehelper/JNIHelp.h

diff --git a/include/nativehelper/JNIHelp.h b/include/nativehelper/JNIHelp.h
index c45445c..aa98c2c 100644
--- a/include/nativehelper/JNIHelp.h
+++ b/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 @@
     _rc; })
 #endif
 
-#endif /*_NATIVEHELPER_JNIHELP_H*/
+#endif  /* NATIVEHELPER_JNIHELP_H_ */

include/nativehelper/jni.h

diff --git a/include/nativehelper/jni.h b/include/nativehelper/jni.h
index 22b1d88..b71cf61 100644
--- a/include/nativehelper/jni.h
+++ b/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 @@
 #define JNIEXPORT
 #define JNICALL
 
-#endif /*_JNI_H*/
+#endif  /* JNI_H_ */