Merge branch 'jc/doc-maintainer'

diff --git a/git-compat-util.h b/git-compat-util.h
index e5a4b7450bfa7a700ce1c76f597266a9724a19f5..dab545e02e17b834da63d911615bd2afa04a702c 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -297,7 +297,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
  * behavior. But since we're only trying to help gcc, anyway, it's OK; other
  * compilers will fall back to using the function as usual.
  */
-#ifdef __GNUC__
+#if defined(__GNUC__) && ! defined(__clang__)
 #define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1)
 #endif