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

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

diff --git a/vm/SignalCatcher.h b/vm/SignalCatcher.h
index f9e1dd7..d1d7a18 100644 (file)
--- a/vm/SignalCatcher.h
+++ b/vm/SignalCatcher.h
@@ -16,18 +16,10 @@
 /*
  * Signal catcher thread.
  */
-#ifndef _DALVIK_SIGNALCATCHER
-#define _DALVIK_SIGNALCATCHER
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef DALVIK_SIGNALCATCHER_H_
+#define DALVIK_SIGNALCATCHER_H_
 
 bool dvmSignalCatcherStartup(void);
 void dvmSignalCatcherShutdown(void);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_DALVIK_SIGNALCATCHER*/
+#endif  // DALVIK_SIGNALCATCHER_H_