From 32fd70213848aafedb754b947e9fd6eaf819b1d3 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 23 Jun 2016 14:06:21 +0200
Subject: Update due to RTEMS printer API changes

---
 freebsd/sys/kern/kern_intr.c                            | 2 +-
 rtemsbsd/include/machine/stdarg.h                       | 2 +-
 rtemsbsd/rtems/rtems-kernel-panic.c                     | 2 ++
 rtemsbsd/rtems/rtems-kernel-program.c                   | 1 +
 testsuite/include/rtems/bsd/test/default-init.h         | 1 +
 testsuite/include/rtems/bsd/test/default-network-init.h | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/freebsd/sys/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c
index e602cd83..87b7241d 100644
--- a/freebsd/sys/kern/kern_intr.c
+++ b/freebsd/sys/kern/kern_intr.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #ifndef __rtems__
 #include <machine/md_var.h>
-#include <machine/stdarg.h>
 #else /* __rtems__ */
   #ifdef INTR_FILTER
     #error INTR_FILTER is currently not suppported with RTEMS
@@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$");
   #include <machine/rtems-bsd-thread.h>
   #define RTEMSBSD_SWI_WAKEUP_EVENT RTEMS_EVENT_31
 #endif /* __rtems__ */
+#include <machine/stdarg.h>
 #ifdef DDB
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h>
diff --git a/rtemsbsd/include/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h
index 936ffd88..38ade6d9 100644
--- a/rtemsbsd/include/machine/stdarg.h
+++ b/rtemsbsd/include/machine/stdarg.h
@@ -1 +1 @@
-/* EMPTY */
+#include <stdarg.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-panic.c b/rtemsbsd/rtems/rtems-kernel-panic.c
index 9b787db6..2de4f931 100644
--- a/rtemsbsd/rtems/rtems-kernel-panic.c
+++ b/rtemsbsd/rtems/rtems-kernel-panic.c
@@ -44,6 +44,8 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 
+#include <stdarg.h>
+
 void
 panic(const char *fmt, ...)
 {
diff --git a/rtemsbsd/rtems/rtems-kernel-program.c b/rtemsbsd/rtems/rtems-kernel-program.c
index 5ade72db..a71d5496 100644
--- a/rtemsbsd/rtems/rtems-kernel-program.c
+++ b/rtemsbsd/rtems/rtems-kernel-program.c
@@ -50,6 +50,7 @@
 #include <sys/mutex.h>
 
 #include <setjmp.h>
+#include <stdarg.h>
 #include <stdlib.h>
 
 #undef printf
diff --git a/testsuite/include/rtems/bsd/test/default-init.h b/testsuite/include/rtems/bsd/test/default-init.h
index 1398170f..2f73442e 100644
--- a/testsuite/include/rtems/bsd/test/default-init.h
+++ b/testsuite/include/rtems/bsd/test/default-init.h
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <rtems/printer.h>
 #include <rtems/stackchk.h>
 #include <rtems/bsd/bsd.h>
 
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index d4683924..1d69fd1a 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -44,6 +44,7 @@
 #include <machine/rtems-bsd-commands.h>
 
 #include <rtems.h>
+#include <rtems/printer.h>
 #include <rtems/stackchk.h>
 #include <rtems/bsd/bsd.h>
 
-- 
cgit v1.2.3