diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-28 17:36:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-28 17:36:16 +0900 |
| commit | c744b2c16ac7fcef617d60c01c51a681646445f3 (patch) | |
| tree | b4a4e472c5b249d4feae3bfb7cb2ecf9fa984ef8 | |
| parent | 66ce5f8e8872f0183bb137911c52b07f1f242d13 (diff) | |
| parent | 4d75f2aea776f434b51481ae65233d6012da1a66 (diff) | |
Merge branch 'jc/c99-fam'
Require C99 style flexible array member support from all platforms.
* jc/c99-fam:
FLEX_ARRAY: require platforms to support the C99 syntax
| -rw-r--r-- | git-compat-util.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 2b8192fd2e..b0673d1a45 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -38,37 +38,8 @@ struct strbuf; DISABLE_WARNING(-Wsign-compare) #endif -#ifndef FLEX_ARRAY -/* - * See if our compiler is known to support flexible array members. - */ - -/* - * Check vendor specific quirks first, before checking the - * __STDC_VERSION__, as vendor compilers can lie and we need to be - * able to work them around. Note that by not defining FLEX_ARRAY - * here, we can fall back to use the "safer but a bit wasteful" one - * later. - */ -#if defined(__SUNPRO_C) && (__SUNPRO_C <= 0x580) -#elif defined(__GNUC__) -# if (__GNUC__ >= 3) -# define FLEX_ARRAY /* empty */ -# else -# define FLEX_ARRAY 0 /* older GNU extension */ -# endif -#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -# define FLEX_ARRAY /* empty */ -#endif - -/* - * Otherwise, default to safer but a bit wasteful traditional style - */ -#ifndef FLEX_ARRAY -# define FLEX_ARRAY 1 -#endif -#endif - +#undef FLEX_ARRAY +#define FLEX_ARRAY /* empty - weather balloon to require C99 FAM */ /* * BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression. |