summaryrefslogtreecommitdiffstats
path: root/vm/UtfString.h
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-06-14 20:31:24 -0700
committerCarl Shapiro <cshapiro@google.com>2011-06-14 20:42:37 -0700
commit375fb116bcb817b37509ab579dbd55cdbb765cbf (patch)
tree8e033bfca03e94b0fc561f2bd6b94d5f8d11b0a3 /vm/UtfString.h
parent7baeded82e40352ebfb43b716e0b1dd752e72e7e (diff)
downloadandroid_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/UtfString.h')
-rw-r--r--vm/UtfString.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/UtfString.h b/vm/UtfString.h
index 20c94fb95..13832dfc2 100644
--- a/vm/UtfString.h
+++ b/vm/UtfString.h
@@ -18,8 +18,8 @@
* UTF-8 and Unicode string manipulation functions, plus convenience
* functions for working with java/lang/String.
*/
-#ifndef _DALVIK_STRING
-#define _DALVIK_STRING
+#ifndef DALVIK_STRING_H_
+#define DALVIK_STRING_H_
#include <string>
#include <vector>
@@ -158,4 +158,4 @@ const u2* dvmStringChars(StringObject* jstr);
*/
int dvmHashcmpStrings(const void* vstrObj1, const void* vstrObj2);
-#endif /*_DALVIK_STRING*/
+#endif // DALVIK_STRING_H_