summaryrefslogtreecommitdiff
path: root/commit-slab.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:20 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:20 -0700
commit7a3ea666331cd6cf8d9a7a15aafc33459b8c571c (patch)
treebdd9065ea6c5010d136e3ca59bf59c1ea68adb24 /commit-slab.h
parent483ca933f8fee1e9264aeef71f48f086e7cc70db (diff)
parentaf920e369778a4cc42519ef523131d29451bf79b (diff)
downloadgit-7a3ea666331cd6cf8d9a7a15aafc33459b8c571c.tar.gz
Merge branch 'js/commit-slab-decl-fix'
* js/commit-slab-decl-fix: commit-slab.h: avoid duplicated global static variables config.c: avoid duplicated global static variables
Diffstat (limited to 'commit-slab.h')
-rw-r--r--commit-slab.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/commit-slab.h b/commit-slab.h
index f84b449413..006a50b548 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -126,16 +126,16 @@ static MAYBE_UNUSED elemtype *slabname## _peek(struct slabname *s, \
return slabname##_at_peek(s, c, 0); \
} \
\
-static int stat_ ##slabname## realloc
+struct slabname
/*
- * Note that this seemingly redundant second declaration is required
+ * Note that this redundant forward declaration is required
* to allow a terminating semicolon, which makes instantiations look
* like function declarations. I.e., the expansion of
*
* define_commit_slab(indegree, int);
*
- * ends in 'static int stat_indegreerealloc;'. This would otherwise
+ * ends in 'struct indegree;'. This would otherwise
* be a syntax error according (at least) to ISO C. It's hard to
* catch because GCC silently parses it by default.
*/