[PATCH] remote.c: spell __attribute__ correctly
- From
Jeff King <peff@peff.net>
- Date
- Apr 25, 2016, 21:15 UTC
- Message-ID
- <20160425211523.GA11227@sigill.intra.peff.net>
- In-Reply-To
- <20160425211030.GA10309@sigill.intra.peff.net>
On Mon, Apr 25, 2016 at 05:10:30PM -0400, Jeff King wrote:
Show 13 quoted lines
> It should be handled in git-compat-util.h, which is included by cache.h, > which is included by remote.c. > > There we have: > > #ifndef __GNUC__ > #ifndef __attribute__ > #define __attribute__(x) > #endif > #endif > > which should make it a noop on compilers which don't know about it. Is > VS (or another file) setting __GNUC__?
Of course it helps if we spell the name right...
-- >8 -- Subject: remote.c: spell __attribute__ correctly
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> --- remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/remote.c b/remote.c index 28fd676..ddc4f8f 100644 --- a/remote.c +++ b/remote.c @@ -1660,7 +1660,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) {
-- 2.8.1.562.gc7e1b3c