Also hook un-macroed putc when it's a macro.

The macro might define it to something else, but the non-macro version
is also used in some cases, e.g. in gcc 4.8's collect2 on Debian with
eglibc 2.17-7.

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index a78fdd9a2e7ed377b36e56555d2de77f9fe1960a..66467b402e14d0a95b630dea38e1e3d59a77a7d7 100644 (file)
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -238,6 +238,14 @@ HOOK_FILE2(int, fputc, stream,
            int, c, FILE *, stream)
 HOOK_FILE2(int, putc, stream,
            int, c, FILE *, stream)
+/* The glibc uses a macro for putc() which expands to _IO_putc(). However
+ * sometimes the raw putc() is used as well, not sure why. Make sure to hook
+ * it too. */
+#ifdef putc
+# undef putc
+HOOK_FILE2(int, putc, stream,
+           int, c, FILE *, stream)
+#endif
 HOOK_FILE1(int, putchar, stdout,
            int, c)
 HOOK_FILE1(int, puts, stdout,