am 93c3b11e: Merge "Increase the default alloc tracker maximum."

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

diff --git a/vm/StdioConverter.h b/vm/StdioConverter.h
index 37384eb..bd5d879 100644 (file)
--- a/vm/StdioConverter.h
+++ b/vm/StdioConverter.h
@@ -16,18 +16,10 @@
 /*
  * Stdout/stderr conversion thread.
  */
-#ifndef _DALVIK_STDOUTCONVERTER
-#define _DALVIK_STDOUTCONVERTER
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef DALVIK_STDOUTCONVERTER_H_
+#define DALVIK_STDOUTCONVERTER_H_
 
 bool dvmStdioConverterStartup(void);
 void dvmStdioConverterShutdown(void);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_DALVIK_STDOUTCONVERTER*/
+#endif  // DALVIK_STDOUTCONVERTER_H_