aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-10-29 12:04:38 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-10-29 12:04:38 +0000
commitaa4eca06c488a53c9aa939d79e484f6a297767df (patch)
tree3427438e39b0d658e8af731846fb9732e4737b59 /extras/mini-os
parent51a6cd5ef83cfbad310f26037d3c94358e902582 (diff)
downloadxen-aa4eca06c488a53c9aa939d79e484f6a297767df.tar.gz
xen-aa4eca06c488a53c9aa939d79e484f6a297767df.tar.bz2
xen-aa4eca06c488a53c9aa939d79e484f6a297767df.zip
minios: Define __INSIDE_MINIOS__ rather than __MINIOS__
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'extras/mini-os')
-rw-r--r--extras/mini-os/Makefile3
-rw-r--r--extras/mini-os/include/sched.h2
-rw-r--r--extras/mini-os/minios.mk3
3 files changed, 4 insertions, 4 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 7d57086c53..ec24cba14a 100644
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -18,9 +18,6 @@ include minios.mk
# Set tester flags
# CFLAGS += -DBLKTEST_WRITE
-# Make the headers define our internal stuff
-CFLAGS += -D__MINIOS__
-
# Define some default flags for linking.
LDLIBS :=
APP_LDLIBS :=
diff --git a/extras/mini-os/include/sched.h b/extras/mini-os/include/sched.h
index 62dc4a93c6..c60e61e94a 100644
--- a/extras/mini-os/include/sched.h
+++ b/extras/mini-os/include/sched.h
@@ -48,7 +48,7 @@ struct thread* create_thread(char *name, void (*function)(void *), void *data);
void exit_thread(void) __attribute__((noreturn));
void schedule(void);
-#ifdef __MINIOS__
+#ifdef __INSIDE_MINIOS__
#define current get_current()
#endif
diff --git a/extras/mini-os/minios.mk b/extras/mini-os/minios.mk
index 7ee19b3a86..698648a904 100644
--- a/extras/mini-os/minios.mk
+++ b/extras/mini-os/minios.mk
@@ -26,6 +26,9 @@ else
DEF_CFLAGS += -O3
endif
+# Make the headers define our internal stuff
+DEF_CFLAGS += -D__INSIDE_MINIOS__
+
# Build the CFLAGS and ASFLAGS for compiling and assembling.
# DEF_... flags are the common mini-os flags,
# ARCH_... flags may be defined in arch/$(TARGET_ARCH_FAM/rules.mk