commit 48c88804293c8ebebe8c6035b0e077f4d55fe625
author Nick Kralevich <nnk@google.com> Mon Aug 27 16:08:12 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 16:08:12 2012 -0700
tree 875817d21d390652f0081021c8fa7b2a6d87e0de
parent 8c7f4777ec2127a95f7f0aea3bf32fe9309a6ada
parent 775dabd4d7f1c08d4229a3578d15990e86dd9c92

am 775dabd4: am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"

* commit '775dabd4d7f1c08d4229a3578d15990e86dd9c92':
  Allow linker to compile with -DLINKER_DEBUG=1

linker/linker_debug.h

diff --git a/linker/linker_debug.h b/linker/linker_debug.h
index f1b6208..48a7abf 100644
--- a/linker/linker_debug.h
+++ b/linker/linker_debug.h
@@ -61,6 +61,11 @@
  */
 #if LINKER_DEBUG
 #include "linker_format.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int debug_verbosity;
 #if LINKER_DEBUG_TO_LOG
 extern int format_log(int, const char *, const char *, ...);
@@ -75,6 +80,11 @@
         if (debug_verbosity > (v)) format_fd(1, x);  \
     } while (0)
 #endif /* !LINKER_DEBUG_TO_LOG */
+
+#ifdef __cplusplus
+};
+#endif
+
 #else /* !LINKER_DEBUG */
 #define _PRINTVF(v,f,x...)   do {} while(0)
 #endif /* LINKER_DEBUG */