Fix compilation with clang.

[coloredstderr/coloredstderr.git] / src / coloredstderr.c

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index e3cc1d6337bd8839b68df218494ee6de1862acbb..cc588836817b4dfaad26713b7a3b24f77c145cff 100644 (file)
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -38,6 +38,11 @@
 
 /* Conflicting declaration in glibc. */
 #undef fwrite_unlocked
+/* These functions may be macros when compiling with hardening flags (fortify)
+ * which cause build failures when used in our hook macros below. Observed
+ * with Clang on Debian Wheezy. */
+#undef printf
+#undef fprintf
 
 
 /* Used by various functions, including debug(). */
@@ -536,3 +541,13 @@ int execvp(char const *file, char * const argv[]) {
     update_environment();
     return real_execvp(file, argv);
 }
+
+#ifdef HAVE_EXECVPE
+extern char **environ;
+int execvpe(char const *file, char * const argv[], char * const envp[]) {
+    /* Fake the environment so we can reuse execvp(). */
+    environ = (char **)envp;
+
+    return execvp(file, argv);
+}
+#endif