diff options
Diffstat (limited to 'sysutils/xenkernel3/patches/patch-ae')
| -rw-r--r-- | sysutils/xenkernel3/patches/patch-ae | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sysutils/xenkernel3/patches/patch-ae b/sysutils/xenkernel3/patches/patch-ae index 6441bf097f1..fc065114d01 100644 --- a/sysutils/xenkernel3/patches/patch-ae +++ b/sysutils/xenkernel3/patches/patch-ae @@ -1,21 +1,32 @@ -$NetBSD: patch-ae,v 1.3 2011/07/19 18:53:54 jym Exp $ +$NetBSD: patch-ae,v 1.3.22.1 2014/05/21 04:05:15 schnoebe Exp $ - protect Xen's stdarg.h from multiple inclusion. - build fix for stdarg under NetBSD. Both backported from upstream. http://xenbits.xensource.com/hg/xen-unstable.hg/file/a574bf2f5059/xen/include/xen/stdarg.h ---- xen/include/xen/stdarg.h.orig 2009-08-06 12:56:43.000000000 +0000 -+++ xen/include/xen/stdarg.h -@@ -1,5 +1,15 @@ +--- xen/include/xen/stdarg.h.orig 2008-04-25 15:03:12.000000000 +0200 ++++ xen/include/xen/stdarg.h 2014-05-14 16:11:10.000000000 +0200 +@@ -1,5 +1,26 @@ +#ifndef __XEN_STDARG_H__ +#define __XEN_STDARG_H__ + #if defined(__OpenBSD__) # include "/usr/include/stdarg.h" +#elif defined (__NetBSD__) ++#ifdef __GNUC__ ++#define __GNUC_PREREQ__(x, y) \ ++ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ ++ (__GNUC__ > (x))) ++#else ++#define __GNUC_PREREQ__(x, y) 0 ++#endif + typedef __builtin_va_list va_list; ++#if __GNUC_PREREQ__(4, 5) ++# define va_start(ap, last) __builtin_va_start((ap), (last)) ++#else +# define va_start(ap, last) __builtin_stdarg_start((ap), (last)) ++#endif /* __GNUC_PREREQ__ */ +# define va_end(ap) __builtin_va_end(ap) +# define va_arg __builtin_va_arg #else |