From 643898034e176f5883ab70203ed01670d809c3b7 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 1 Oct 2009 12:28:54 +0100
Subject: stubdom/minios: re-structure headers

As part of making stubdom usable on NetBSD, it is necessary to
restructure the minios headers to avoid conflicts with NetBSD's
crossbuild toolchain.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 extras/mini-os/lib/math.c           |  6 +++---
 extras/mini-os/lib/printf.c         | 14 +++++++-------
 extras/mini-os/lib/stack_chk_fail.c |  4 ++--
 extras/mini-os/lib/string.c         |  8 ++++----
 extras/mini-os/lib/xmalloc.c        | 12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'extras/mini-os/lib')

diff --git a/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c
index 55ece1ed51..00a13a5004 100644
--- a/extras/mini-os/lib/math.c
+++ b/extras/mini-os/lib/math.c
@@ -55,9 +55,9 @@
  * $FreeBSD: src/sys/libkern/divdi3.c,v 1.6 1999/08/28 00:46:31 peter Exp $
 */
 
-#include <types.h>
-#include <lib.h>
-#include <time.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/time.h>
 
 	/* On ia64 these functions lead to crashes. These are replaced by
 	 * assembler functions. */
diff --git a/extras/mini-os/lib/printf.c b/extras/mini-os/lib/printf.c
index a986616586..833bb96a32 100644
--- a/extras/mini-os/lib/printf.c
+++ b/extras/mini-os/lib/printf.c
@@ -56,13 +56,13 @@
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <hypervisor.h>
-#include <lib.h>
-#include <mm.h>
-#include <ctype.h>
-#include <limits.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/lib.h>
+#include <mini-os/mm.h>
+#include <mini-os/ctype.h>
+#include <mini-os/limits.h>
 
 /**
  * simple_strtoul - convert a string to an unsigned long
diff --git a/extras/mini-os/lib/stack_chk_fail.c b/extras/mini-os/lib/stack_chk_fail.c
index ade0045f0a..05aea20059 100644
--- a/extras/mini-os/lib/stack_chk_fail.c
+++ b/extras/mini-os/lib/stack_chk_fail.c
@@ -1,5 +1,5 @@
-#include <kernel.h>
-#include <console.h>
+#include <mini-os/kernel.h>
+#include <mini-os/console.h>
 
 void __stack_chk_fail(void)
 {
diff --git a/extras/mini-os/lib/string.c b/extras/mini-os/lib/string.c
index a6f2abe0b0..8b241464e2 100644
--- a/extras/mini-os/lib/string.c
+++ b/extras/mini-os/lib/string.c
@@ -57,10 +57,10 @@ int ffsll (long long int lli)
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 
 int memcmp(const void * cs,const void * ct,size_t count)
 {
diff --git a/extras/mini-os/lib/xmalloc.c b/extras/mini-os/lib/xmalloc.c
index c33c48ab41..14fe796131 100644
--- a/extras/mini-os/lib/xmalloc.c
+++ b/extras/mini-os/lib/xmalloc.c
@@ -36,12 +36,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <os.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <list.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/list.h>
+#include <mini-os/xmalloc.h>
 
 #ifndef HAVE_LIBC
 static MINIOS_LIST_HEAD(freelist);
-- 
cgit v1.2.3