minios: Define __INSIDE_MINIOS__ rather than __MINIOS__

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

diff --git a/Makefile b/Makefile
index 7d57086c53a8909e282a57c7ae73f7b24eee705b..ec24cba14af5a9edda1ac3d8d0da3b3110c5f405 100644 (file)
--- 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 62dc4a93c68934410a1338dfebba207642e012bd..c60e61e94ae2c6510e23a464cada3eddfc750939 100644 (file)
--- 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 7ee19b3a86c0d241fb00f4740396772b15750c75..698648a904aa4791b74f3327f567c2bdc116c97c 100644 (file)
--- 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