Merge branch 'rs/commit-pptr-simplify' into maint

[git-core/git.git] / usage.c

diff --git a/usage.c b/usage.c
index 1dad03f..0efa3fa 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -148,6 +148,7 @@ void NORETURN die_errno(const char *fmt, ...)
        va_end(params);
 }
 
+#undef error_errno
 int error_errno(const char *fmt, ...)
 {
        char buf[1024];