merge in klp-release history after reset to klp-dev

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

diff --git a/vm/Dalvik.h b/vm/Dalvik.h
index a47388a..eecbf8d 100644 (file)
--- a/vm/Dalvik.h
+++ b/vm/Dalvik.h
@@ -17,8 +17,8 @@
 /*
  * All-inclusive internal header file.  Include this to get everything useful.
  */
-#ifndef _DALVIK_DALVIK
-#define _DALVIK_DALVIK
+#ifndef DALVIK_DALVIK_H_
+#define DALVIK_DALVIK_H_
 
 #include "Common.h"
 #include "Inlines.h"
@@ -60,7 +60,6 @@
 #include "alloc/WriteBarrier.h"
 #include "oo/AccessCheck.h"
 #include "JarFile.h"
-#include "Properties.h"
 #include "jdwp/Jdwp.h"
 #include "SignalCatcher.h"
 #include "StdioConverter.h"
@@ -85,4 +84,4 @@
 #include "InlineNative.h"
 #include "oo/ObjectInlines.h"
 
-#endif /*_DALVIK_DALVIK*/
+#endif  // DALVIK_DALVIK_H_