diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
| commit | 7a3ea666331cd6cf8d9a7a15aafc33459b8c571c (patch) | |
| tree | bdd9065ea6c5010d136e3ca59bf59c1ea68adb24 | |
| parent | Merge branch 'jk/completion-diff-submodule' (diff) | |
| parent | commit-slab.h: avoid duplicated global static variables (diff) | |
| download | tgif-7a3ea666331cd6cf8d9a7a15aafc33459b8c571c.tar.xz | |
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
| -rw-r--r-- | builtin/config.c | 1 | ||||
| -rw-r--r-- | commit-slab.h | 6 |
2 files changed, 3 insertions, 4 deletions
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. */ |