kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2016-08-10 12:33:20 -07:00
parent 483ca933f8 af920e3697
commit 7a3ea66633
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/config.c
View File

@ -25,7 +25,6 @@ static char term = '\n';
static int use_global_config, use_system_config, use_local_config; static int use_global_config, use_system_config, use_local_config;
static struct git_config_source given_config_source; static struct git_config_source given_config_source;
static int actions, types; static int actions, types;
static const char *get_color_slot, *get_colorbool_slot;
static int end_null; static int end_null;
static int respect_includes = -1; static int respect_includes = -1;
static int show_origin; static int show_origin;

6
commit-slab.h
View File

@ -126,16 +126,16 @@ static MAYBE_UNUSED elemtype *slabname## _peek(struct slabname *s, \
return slabname##_at_peek(s, c, 0); \ 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 * to allow a terminating semicolon, which makes instantiations look
* like function declarations. I.e., the expansion of * like function declarations. I.e., the expansion of
* *
* define_commit_slab(indegree, int); * 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 * be a syntax error according (at least) to ISO C. It's hard to
* catch because GCC silently parses it by default. * catch because GCC silently parses it by default.
*/ */