am beeeb788: am 05fa5fd5: Merge "Simplify merges of the annotation code."

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

diff --git a/vm/DalvikVersion.h b/vm/DalvikVersion.h
index 8502b34..e71c839 100644 (file)
--- a/vm/DalvikVersion.h
+++ b/vm/DalvikVersion.h
@@ -17,21 +17,21 @@
 /*
  * Dalvik VM version info.
  */
-#ifndef _DALVIK_VERSION
-#define _DALVIK_VERSION
+#ifndef DALVIK_VERSION_H_
+#define DALVIK_VERSION_H_
 
 /*
  * The version we show to tourists.
  */
 #define DALVIK_MAJOR_VERSION    1
-#define DALVIK_MINOR_VERSION    5
-#define DALVIK_BUG_VERSION      1
+#define DALVIK_MINOR_VERSION    6
+#define DALVIK_BUG_VERSION      0
 
 /*
  * VM build number.  This must change whenever something that affects the
  * way classes load changes, e.g. field ordering or vtable layout.  Changing
  * this guarantees that the optimized form of the DEX file is regenerated.
  */
-#define DALVIK_VM_BUILD         24
+#define DALVIK_VM_BUILD         27
 
-#endif /*_DALVIK_VERSION*/
+#endif  // DALVIK_VERSION_H_