[PATCH jk/strbuf-vaddf] compat: fall back on __va_copy if available
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Mar 8, 2011, 08:33 UTC
- Message-ID
- <20110308083344.GD26516@elie>
- In-Reply-To
- <AANLkTin7NBx5NVRkHpgymcZfnaZaJehMMpPv=zD+cKtV@mail.gmail.com>
Since an obvious implementation of va_list is to make it a pointer into the stack frame, implementing va_copy as "dst = src" will work on many systems. Platforms that use something different (e.g., a size-1 array of structs, to be assigned with *(dst) = *(src)) will need some other compatibility macro, though.
Luckily, as the glibc manual hints, such systems tend to provide the __va_copy macro (introduced in GCC in March, 1997). By using that if it is available, we can cover our bases pretty well.
Discovered by building with CC="gcc -std=c89" on an amd64 machine:
$ make CC=c89 strbuf.o [...] strbuf.c: In function ‘strbuf_vaddf’: strbuf.c:211:2: error: incompatible types when assigning to type ‘va_list’ from type ‘struct __va_list_tag *’ make: *** [strbuf.o] Error 1
Explained-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Erik Faye-Lund wrote:
> Wouldn't it be even more portable to fall back on use __va_copy (if > present), as suggested by Junio in > <7vbpip86q5.fsf@alter.siamese.dyndns.org>?
Yes, it seems so.
git-compat-util.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h index 00d41e4..f4cb0a9 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -536,7 +536,16 @@ void git_qsort(void *base, size_t nmemb, size_t size, #endif #ifndef va_copy -#define va_copy(dst,src) (dst) = (src) +/* + * Since an obvious implementation of va_list would be to make it a + * pointer into the stack frame, a simple assignment will work on + * many systems. But let's try to be more portable. + */ +#ifdef __va_copy +#define va_copy(dst, src) __va_copy(dst, src) +#else +#define va_copy(dst, src) ((dst) = (src)) +#endif #endif /*
-- 1.7.4.1