proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-31 11:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct the spelling of the FLEX_ARRAY macro

Browse Source 
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>
This commit is contained in:
Ramsay Jones 2009-06-14 22:10:23 +01:00 committed by Andreas Ericsson
parent 10aa3fa72a
commit 2bf93fa107
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc-compat.h
View File

@ -7,14 +7,14 @@
/*
* 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)
# define FLEX_ARRAY /* empty */
# define GIT_FLEX_ARRAY /* empty */
# elif defined(__GNUC__)
# if (__GNUC__ >= 3)
# define FLEX_ARRAY /* empty */
# define GIT_FLEX_ARRAY /* empty */
# else
# define FLEX_ARRAY 0 /* older GNU extension */
# define GIT_FLEX_ARRAY 0 /* older GNU extension */
# endif
# endif
@ -25,9 +25,9 @@
#endif
#ifdef __GNUC__
# define TYPEOF(x) (__typeof__(x))
# define GIT_TYPEOF(x) (__typeof__(x))
#else
# define TYPEOF(x)
# define GIT_TYPEOF(x)
#endif
#endif /* INCLUDE_compat_h__ */

2
src/odb.c
View File

@ -70,7 +70,7 @@ typedef struct git_pack git_pack;
typedef struct {
size_t n_packs;
unsigned int refcnt;
git_pack *packs[FLEX_ARRAY];
git_pack *packs[GIT_FLEX_ARRAY];
} git_packlist;
struct git_odb {