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

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

diff --git a/vm/Ddm.h b/vm/Ddm.h
index af7f6e1..f8c22ee 100644 (file)
--- a/vm/Ddm.h
+++ b/vm/Ddm.h
@@ -16,12 +16,8 @@
 /*
  * Dalvik Debug Monitor
  */
-#ifndef _DALVIK_DDM
-#define _DALVIK_DDM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef DALVIK_DDM_H_
+#define DALVIK_DDM_H_
 
 /*
  * Handle a packet full of DDM goodness.
@@ -88,8 +84,4 @@ ArrayObject* dvmDdmGetStackTraceById(u4 threadId);
  */
 ArrayObject* dvmDdmGetRecentAllocations(void);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_DALVIK_DDM*/
+#endif  // DALVIK_DDM_H_