X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=libdex%2FDexUtf.h;h=cb3d919ae12e5530771ba2db622585e2321c801f;hb=d8d1b6d7910375a82b8e723ba7d3ee4544db44ac;hp=88d98b0110abe6ff453fe475368b66c5945467cf;hpb=ccc740b24bd2b814548554f51a910206a3d07927;p=android-x86%2Fdalvik.git

diff --git a/libdex/DexUtf.h b/libdex/DexUtf.h
index 88d98b011..cb3d919ae 100644
--- a/libdex/DexUtf.h
+++ b/libdex/DexUtf.h
@@ -18,15 +18,11 @@
  * Validate and manipulate MUTF-8 (modified UTF-8) encoded string data.
  */
 
-#ifndef _LIBDEX_DEXUTF
-#define _LIBDEX_DEXUTF
+#ifndef LIBDEX_DEXUTF_H_
+#define LIBDEX_DEXUTF_H_
 
 #include "DexFile.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Retrieve the next UTF-16 character from a UTF-8 string.
  *
@@ -132,8 +128,4 @@ bool dexIsClassDescriptor(const char* s);
  * is for anything but "void". */
 bool dexIsFieldDescriptor(const char* s);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* def _LIBDEX_DEXUTF */
+#endif  // LIBDEX_DEXUTF_H_