diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 11:19:40 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-22 11:19:40 +0000 |
| commit | c6c6a0890d23024c78426352d3da55aec2e472d5 (patch) | |
| tree | b172491e9ebaa98a8eef9887ce29bfe7c4f4703c /extras/mini-os | |
| parent | 956eabb460f52d24bd983731cdef07a3cf0bdc82 (diff) | |
| download | xen-c6c6a0890d23024c78426352d3da55aec2e472d5.tar.gz xen-c6c6a0890d23024c78426352d3da55aec2e472d5.tar.bz2 xen-c6c6a0890d23024c78426352d3da55aec2e472d5.zip | |
minios: Fix x86_32 compilation
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'extras/mini-os')
| -rw-r--r-- | extras/mini-os/include/fs.h | 1 | ||||
| -rw-r--r-- | extras/mini-os/include/types.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/arch_sched.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/kernel.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/extras/mini-os/include/fs.h b/extras/mini-os/include/fs.h index 1e144b4e6d..1555a5adcc 100644 --- a/extras/mini-os/include/fs.h +++ b/extras/mini-os/include/fs.h @@ -3,6 +3,7 @@ #include <xen/io/fsif.h> #include <semaphore.h> +#include <types.h> struct fs_import { diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index 8767643b0d..a53db24a93 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -19,6 +19,7 @@ #ifndef _TYPES_H_ #define _TYPES_H_ +#include <stddef.h> typedef signed char s8; typedef unsigned char u8; @@ -78,5 +79,4 @@ typedef s64 int64_t; #define UINT_MAX (~0U) typedef long ssize_t; -typedef unsigned long size_t; #endif /* _TYPES_H_ */ diff --git a/extras/mini-os/include/x86/arch_sched.h b/extras/mini-os/include/x86/arch_sched.h index b2b2556ffb..877440762e 100644 --- a/extras/mini-os/include/x86/arch_sched.h +++ b/extras/mini-os/include/x86/arch_sched.h @@ -12,7 +12,7 @@ static inline struct thread* get_current(void) #else register unsigned long sp asm("rsp"); #endif - current = (void *)(sp & ~(STACK_SIZE-1)); + current = (void *)(unsigned long)(sp & ~(STACK_SIZE-1)); return *current; } diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index b92558a51f..6e56315549 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -89,7 +89,7 @@ static void netfront_thread(void *p) init_netfront(NULL, NULL, NULL); } -#define RAND_MIX 2654435769 +#define RAND_MIX 2654435769U /* Should be random enough for this use */ static int rand(void) |