Merge branch 'jc/c99-var-decl-in-for-loop'
Weather balloon to find compilers that do not grok variable declaration in the for() loop. * jc/c99-var-decl-in-for-loop: revision: use C99 declaration of variable in for() loop
This commit is contained in:
1
Makefile
1
Makefile
@ -1206,6 +1206,7 @@ endif
|
|||||||
# Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
|
# Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
|
||||||
# tweaked by config.* below as well as the command-line, both of
|
# tweaked by config.* below as well as the command-line, both of
|
||||||
# which'll override these defaults.
|
# which'll override these defaults.
|
||||||
|
# Older versions of GCC may require adding "-std=gnu99" at the end.
|
||||||
CFLAGS = -g -O2 -Wall
|
CFLAGS = -g -O2 -Wall
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
CC_LD_DYNPATH = -Wl,-rpath,
|
CC_LD_DYNPATH = -Wl,-rpath,
|
||||||
|
11
revision.c
11
revision.c
@ -44,10 +44,15 @@ static inline int want_ancestry(const struct rev_info *revs);
|
|||||||
|
|
||||||
void show_object_with_name(FILE *out, struct object *obj, const char *name)
|
void show_object_with_name(FILE *out, struct object *obj, const char *name)
|
||||||
{
|
{
|
||||||
const char *p;
|
|
||||||
|
|
||||||
fprintf(out, "%s ", oid_to_hex(&obj->oid));
|
fprintf(out, "%s ", oid_to_hex(&obj->oid));
|
||||||
for (p = name; *p && *p != '\n'; p++)
|
/*
|
||||||
|
* This "for (const char *p = ..." is made as a first step towards
|
||||||
|
* making use of such declarations elsewhere in our codebase. If
|
||||||
|
* it causes compilation problems on your platform, please report
|
||||||
|
* it to the Git mailing list at git@vger.kernel.org. In the meantime,
|
||||||
|
* adding -std=gnu99 to CFLAGS may help if you are with older GCC.
|
||||||
|
*/
|
||||||
|
for (const char *p = name; *p && *p != '\n'; p++)
|
||||||
fputc(*p, out);
|
fputc(*p, out);
|
||||||
fputc('\n', out);
|
fputc('\n', out);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user