summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-04-25 17:15:23 -0400
committerJunio C Hamano <gitster@pobox.com>2016-04-25 15:32:23 -0700
commit060e7766ba34dc4fef351494239235ba365edd18 (patch)
tree02740c3933cd7330b3611e8b228e42f7aac675fe
parent29bc88505f22068d7ee6694240e6b13fddb5d059 (diff)
downloadgit-060e7766ba34dc4fef351494239235ba365edd18.tar.gz
remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5
We want to tell the compiler that error_buf() uses printf()-style arguments via the __attribute__ mechanism, but the original commit (3a429d0), forgot the trailing "__". This happens to work with real GNUC-compatible compilers like gcc and clang, but confuses our fallback macro in git-compat-util.h, which only matches the official name (and thus the build fails on compilers like Visual Studio). Reported-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index a467d4ff07..6f4adac558 100644
--- a/remote.c
+++ b/remote.c
@@ -1705,7 +1705,7 @@ int branch_merge_matches(struct branch *branch,
return refname_match(branch->merge[i]->src, refname);
}
-__attribute((format (printf,2,3)))
+__attribute__((format (printf,2,3)))
static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
if (err) {