aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-05-04 11:24:19 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-05-04 11:24:19 +0100
commitf2882b87263ff202cd1b1851d269ba76c5137adb (patch)
tree292a61bb3165851527e83105ef833e9ec4739829
parent55723b70ac51b1f3230793068dd2371dda820bb8 (diff)
downloadxen-f2882b87263ff202cd1b1851d269ba76c5137adb.tar.gz
xen-f2882b87263ff202cd1b1851d269ba76c5137adb.tar.bz2
xen-f2882b87263ff202cd1b1851d269ba76c5137adb.zip
Change Mini-OS so that it uses stddef.h to define size_t and
NULL. This problem fixes errors that occur when linking Mini-OS with ANSI standard code that uses stddef.h. Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r--extras/mini-os/include/lib.h1
-rw-r--r--extras/mini-os/include/os.h3
-rw-r--r--extras/mini-os/include/types.h2
3 files changed, 1 insertions, 5 deletions
diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h
index 7631349faf..473a059705 100644
--- a/extras/mini-os/include/lib.h
+++ b/extras/mini-os/include/lib.h
@@ -56,6 +56,7 @@
#define _LIB_H_
#include <stdarg.h>
+#include <stddef.h>
#include <console.h>
/* printing */
diff --git a/extras/mini-os/include/os.h b/extras/mini-os/include/os.h
index 8758c5dd23..883d5f6b1d 100644
--- a/extras/mini-os/include/os.h
+++ b/extras/mini-os/include/os.h
@@ -7,9 +7,6 @@
#ifndef _OS_H_
#define _OS_H_
-#define NULL 0
-
-
#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
#define __builtin_expect(x, expected_value) (x)
#endif
diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h
index 8c3a6b385e..8194fba3c0 100644
--- a/extras/mini-os/include/types.h
+++ b/extras/mini-os/include/types.h
@@ -34,8 +34,6 @@ typedef signed long s64;
typedef unsigned long u64;
#endif
-typedef unsigned int size_t;
-
/* FreeBSD compat types */
typedef unsigned char u_char;
typedef unsigned int u_int;