From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 29 Oct 2008 12:04:38 +0000 (+0000)
Subject: minios: Define __INSIDE_MINIOS__ rather than __MINIOS__
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=21a5129d6d273e4b3278aa48ecd61bb6244428c9;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git

minios: Define __INSIDE_MINIOS__ rather than __MINIOS__

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/Makefile b/Makefile
index 7d57086..ec24cba 100644
--- a/Makefile
+++ b/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/include/sched.h b/include/sched.h
index 62dc4a9..c60e61e 100644
--- a/include/sched.h
+++ b/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/minios.mk b/minios.mk
index 7ee19b3..698648a 100644
--- a/minios.mk
+++ b/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