Merge branch 'mz/rebase-tests'

diff --git a/usage.c b/usage.c
index 9d2961ec200fa235bf9a761a2ea0a948b3578334..ed146453cabeb9e82bef0c5610cda47d1b2a0b1c 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -138,6 +138,7 @@ void NORETURN die_errno(const char *fmt, ...)
        va_end(params);
 }
 
+#undef error
 int error(const char *err, ...)
 {
        va_list params;