diff options
| author | Keir Fraser <keir@xen.org> | 2011-05-28 09:17:15 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-05-28 09:17:15 +0100 |
| commit | a4b9cae427bd3e398c12847d1268488be71b73e7 (patch) | |
| tree | 9b5ce8e691b131c1252ea604fe4401f803074c4a | |
| parent | bdfd430bc639a48dd48a19a2677ea8376f61b8a6 (diff) | |
| download | xen-a4b9cae427bd3e398c12847d1268488be71b73e7.tar.gz xen-a4b9cae427bd3e398c12847d1268488be71b73e7.tar.bz2 xen-a4b9cae427bd3e398c12847d1268488be71b73e7.zip | |
Clean up stdarg handling a little. Fix for NetBSD.
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 23432:14eb8e1fcd82
xen-unstable date: Fri May 27 15:49:24 2011 +0100
| -rw-r--r-- | xen/common/libelf/libelf-loader.c | 2 | ||||
| -rw-r--r-- | xen/common/libelf/libelf-private.h | 1 | ||||
| -rw-r--r-- | xen/common/vsprintf.c | 1 | ||||
| -rw-r--r-- | xen/include/xen/stdarg.h | 5 |
4 files changed, 6 insertions, 3 deletions
diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c index 69871e5aed..1ccf7d35a6 100644 --- a/xen/common/libelf/libelf-loader.c +++ b/xen/common/libelf/libelf-loader.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdarg.h> - #include "libelf-private.h" /* ------------------------------------------------------------------------ */ diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h index e47ff3b8cd..3ef753c1b3 100644 --- a/xen/common/libelf/libelf-private.h +++ b/xen/common/libelf/libelf-private.h @@ -40,6 +40,7 @@ #else /* !__XEN__ */ +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 8fd1ac25de..d9128e1691 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -16,7 +16,6 @@ * - scnprintf and vscnprintf */ -#include <xen/stdarg.h> #include <xen/ctype.h> #include <xen/lib.h> #include <asm/div64.h> diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index 9508bc4df4..f26fa54663 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,5 +1,10 @@ #if defined(__OpenBSD__) # include "/usr/include/stdarg.h" +#elif defined (__NetBSD__) + typedef __builtin_va_list va_list; +# define va_start(ap, last) __builtin_stdarg_start((ap), (last)) +# define va_end(ap) __builtin_va_end(ap) +# define va_arg __builtin_va_arg #else # include <stdarg.h> #endif |