Commit 2bf93fa1 by Ramsay Jones Committed by Andreas Ericsson

Correct the spelling of the FLEX_ARRAY macro

When setting the default value, the macro name was specified
as GIT_FLEX_ARRAY, which is inconsistent with it's earlier
usage in the file. This caused a compilation error, using the
MS Visual C/C++ compiler, when compiling the git_packlist
struct definition in src/odb.c.

In addition to changing the spelling of the FLEX_ARRAY macro
to GIT_FLEX_ARRAY, including it's use in src/odb.c, we also
rename the TYPEOF macro to GIT_TYPEOF.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
parent 10aa3fa7
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
/* /*
* See if our compiler is known to support flexible array members. * See if our compiler is known to support flexible array members.
*/ */
#ifndef FLEX_ARRAY #ifndef GIT_FLEX_ARRAY
# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
# define FLEX_ARRAY /* empty */ # define GIT_FLEX_ARRAY /* empty */
# elif defined(__GNUC__) # elif defined(__GNUC__)
# if (__GNUC__ >= 3) # if (__GNUC__ >= 3)
# define FLEX_ARRAY /* empty */ # define GIT_FLEX_ARRAY /* empty */
# else # else
# define FLEX_ARRAY 0 /* older GNU extension */ # define GIT_FLEX_ARRAY 0 /* older GNU extension */
# endif # endif
# endif # endif
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
# define TYPEOF(x) (__typeof__(x)) # define GIT_TYPEOF(x) (__typeof__(x))
#else #else
# define TYPEOF(x) # define GIT_TYPEOF(x)
#endif #endif
#endif /* INCLUDE_compat_h__ */ #endif /* INCLUDE_compat_h__ */
...@@ -70,7 +70,7 @@ typedef struct git_pack git_pack; ...@@ -70,7 +70,7 @@ typedef struct git_pack git_pack;
typedef struct { typedef struct {
size_t n_packs; size_t n_packs;
unsigned int refcnt; unsigned int refcnt;
git_pack *packs[FLEX_ARRAY]; git_pack *packs[GIT_FLEX_ARRAY];
} git_packlist; } git_packlist;
struct git_odb { struct git_odb {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment