From 6c10e225bc759d69af520a551b9d7b37f3ae0a82 Mon Sep 17 00:00:00 2001 From: Nigel Croxon Date: Mon, 25 Aug 2014 08:51:23 -0400 Subject: [PATCH] From: David Decotigny Date: Thu, 31 Jul 2014 18:19:16 -0700 Subject: [PATCH 5/5] allow to use external stdarg.h in cases we use gnu-efi together with other libs that define stdarg.h, break the tie by telling gnu-efi to use that stdarg.h . Signed-off-by: David Decotigny Signed-off-by: Nigel Croxon --- gnu-efi-3.0/inc/efistdarg.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu-efi-3.0/inc/efistdarg.h b/gnu-efi-3.0/inc/efistdarg.h index 440f9cd..bb04b31 100644 --- a/gnu-efi-3.0/inc/efistdarg.h +++ b/gnu-efi-3.0/inc/efistdarg.h @@ -19,10 +19,15 @@ Revision History --*/ +#ifndef GNU_EFI_USE_EXTERNAL_STDARG typedef __builtin_va_list va_list; -#define va_start(v,l) __builtin_va_start(v,l) -#define va_end(v) __builtin_va_end(v) -#define va_arg(v,l) __builtin_va_arg(v,l) -#define va_copy(d,s) __builtin_va_copy(d,s) +# define va_start(v,l) __builtin_va_start(v,l) +# define va_end(v) __builtin_va_end(v) +# define va_arg(v,l) __builtin_va_arg(v,l) +# define va_copy(d,s) __builtin_va_copy(d,s) +#else +# include +#endif + #endif -- 1.8.4.5