From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 19:33:20 +0000 (-0700)
Subject: Merge branch 'js/commit-slab-decl-fix'
X-Git-Tag: v2.10.0-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a3ea666331cd6cf8d9a7a15aafc33459b8c571c?hp=483ca933f8fee1e9264aeef71f48f086e7cc70db

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
---

diff --git a/builtin/config.c b/builtin/config.c
index a991a53418..6cbf73369b 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -25,7 +25,6 @@ static char term = '\n';
 static int use_global_config, use_system_config, use_local_config;
 static struct git_config_source given_config_source;
 static int actions, types;
-static const char *get_color_slot, *get_colorbool_slot;
 static int end_null;
 static int respect_includes = -1;
 static int show_origin;
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.
  */