minios: Fix x86_32 compilation

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/include/fs.h b/include/fs.h
index 1e144b4e6d2fcc0c307e58652813072fb08aba9c..1555a5adcc0bf8c24c29916c691da2276f1e2ba6 100644 (file)
--- a/include/fs.h
+++ b/include/fs.h
@@ -3,6 +3,7 @@
 
 #include <xen/io/fsif.h>
 #include <semaphore.h>
+#include <types.h>
 
 struct fs_import 
 {

diff --git a/include/types.h b/include/types.h
index 8767643b0dda5fa565151305fa0ed0721e931fd8..a53db24a93cdea556ddc314f3472096be67ea329 100644 (file)
--- a/include/types.h
+++ b/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/include/x86/arch_sched.h b/include/x86/arch_sched.h
index b2b2556ffb9b605a26df563afb49e7ecf7c71c29..877440762e01c0d5547bd5c74b80d1c4ef40c1c8 100644 (file)
--- a/include/x86/arch_sched.h
+++ b/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/kernel.c b/kernel.c
index b92558a51f38372deef6a4c671175156233502c5..6e56315549a57e45aba502495f7c339fe60cdda8 100644 (file)
--- a/kernel.c
+++ b/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)