[Xen-changelog] [xen-4.1-testing] Clean up stdarg handling a little. Fix for NetBSD.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1306570635 -3600
# Node ID 3f2f2543e9434268b7b5c89b1420383d73003b4a
# Parent  f408456e30e8850101fe3917b8b682ddba9e668f
Clean up stdarg handling a little. Fix for NetBSD.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   23432:14eb8e1fcd82
xen-unstable date:        Fri May 27 15:49:24 2011 +0100
---


diff -r f408456e30e8 -r 3f2f2543e943 xen/common/libelf/libelf-loader.c
--- a/xen/common/libelf/libelf-loader.c Sat May 28 09:16:08 2011 +0100
+++ b/xen/common/libelf/libelf-loader.c Sat May 28 09:17:15 2011 +0100
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
  */
 
-#include <stdarg.h>
-
 #include "libelf-private.h"
 
 /* ------------------------------------------------------------------------ */
diff -r f408456e30e8 -r 3f2f2543e943 xen/common/libelf/libelf-private.h
--- a/xen/common/libelf/libelf-private.h        Sat May 28 09:16:08 2011 +0100
+++ b/xen/common/libelf/libelf-private.h        Sat May 28 09:17:15 2011 +0100
@@ -40,6 +40,7 @@
 
 #else /* !__XEN__ */
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r f408456e30e8 -r 3f2f2543e943 xen/common/vsprintf.c
--- a/xen/common/vsprintf.c     Sat May 28 09:16:08 2011 +0100
+++ b/xen/common/vsprintf.c     Sat May 28 09:17:15 2011 +0100
@@ -16,7 +16,6 @@
  * - scnprintf and vscnprintf
  */
 
-#include <xen/stdarg.h>
 #include <xen/ctype.h>
 #include <xen/lib.h>
 #include <asm/div64.h>
diff -r f408456e30e8 -r 3f2f2543e943 xen/include/xen/stdarg.h
--- a/xen/include/xen/stdarg.h  Sat May 28 09:16:08 2011 +0100
+++ b/xen/include/xen/stdarg.h  Sat May 28 09:17:15 2011 +0100
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog