diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2009-06-15 01:10:23 +0400 |
|---|---|---|
| committer | Andreas Ericsson <ae@op5.se> | 2009-06-15 09:33:44 +0400 |
| commit | 2bf93fa1071c3df7f43926c8e6c3bd2353d78160 (patch) | |
| tree | eeae5bdbc9a3075ff9ee6a08af804b5df11154ec /src/cc-compat.h | |
| parent | 10aa3fa72afab7ee31e116ae06442fe0f7b79df2 (diff) | |
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>
Diffstat (limited to 'src/cc-compat.h')
| -rw-r--r-- | src/cc-compat.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cc-compat.h b/src/cc-compat.h index 41fb16c71..32e41390c 100644 --- a/src/cc-compat.h +++ b/src/cc-compat.h @@ -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__ */ |