am 813a3a2d: Merge "If dalvik wants ASCII casing, it needs to ask for it."

[android-x86/dalvik.git] / vm / RawDexFile.h

diff --git a/vm/RawDexFile.h b/vm/RawDexFile.h
index f2c1b68..358c669 100644 (file)
--- a/vm/RawDexFile.h
+++ b/vm/RawDexFile.h
@@ -18,21 +18,17 @@
  * them directly, except to create the optimized version that we tuck in
  * the cache area.
  */
-#ifndef _DALVIK_RAWDEXFILE
-#define _DALVIK_RAWDEXFILE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef DALVIK_RAWDEXFILE_H_
+#define DALVIK_RAWDEXFILE_H_
 
 /*
  * Structure representing a "raw" DEX file, in its unswapped unoptimized
  * state.
  */
-typedef struct RawDexFile {
+struct RawDexFile {
     char*       cacheFileName;
     DvmDex*     pDvmDex;
-} RawDexFile;
+};
 
 /*
  * Open a raw ".dex" file, optimize it, and load it.
@@ -72,8 +68,4 @@ INLINE const char* dvmGetRawDexFileCacheFileName(RawDexFile* pRawDexFile) {
     return pRawDexFile->cacheFileName;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_DALVIK_RAWDEXFILE*/
+#endif  // DALVIK_RAWDEXFILE_H_