Clean up stdarg handling a little. Fix for NetBSD.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c
index 69871e5aedf5bf5109302211d8791de6b29bfb55..1ccf7d35a68aacf05a7df60835bca42e1295026d 100644 (file)
--- 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 e47ff3b8cd54986a15440b56adad31386c0874cc..3ef753c1b319d6603d88cb26462f76b2ec9aa8c0 100644 (file)
--- 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 8fd1ac25de263e19373f4c7d0b24c04eb15d419b..d9128e1691e4b538d3cb8b903738d6d72e81e65b 100644 (file)
--- 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 9508bc4df431a279795d247d3367ce61ce7b93d8..f26fa5466309a0b0775d8eb4f6b389a1b44abc96 100644 (file)
--- 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