[Xen-changelog] [xen-unstable] minios: Define __INSIDE_MINIOS__ rather than __MINIOS__

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225281878 0
# Node ID 183d2d7adc2f02db63aedaf199e3b006d2e4a053
# Parent  bec755616e8e4b8a0dd65f7a28edc1b8936906d4
minios: Define __INSIDE_MINIOS__ rather than __MINIOS__

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 extras/mini-os/Makefile        |    3 ---
 extras/mini-os/include/sched.h |    2 +-
 extras/mini-os/minios.mk       |    3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff -r bec755616e8e -r 183d2d7adc2f extras/mini-os/Makefile
--- a/extras/mini-os/Makefile   Wed Oct 29 10:19:35 2008 +0000
+++ b/extras/mini-os/Makefile   Wed Oct 29 12:04:38 2008 +0000
@@ -17,9 +17,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 := 
diff -r bec755616e8e -r 183d2d7adc2f extras/mini-os/include/sched.h
--- a/extras/mini-os/include/sched.h    Wed Oct 29 10:19:35 2008 +0000
+++ b/extras/mini-os/include/sched.h    Wed Oct 29 12:04:38 2008 +0000
@@ -48,7 +48,7 @@ void exit_thread(void) __attribute__((no
 void exit_thread(void) __attribute__((noreturn));
 void schedule(void);
 
-#ifdef __MINIOS__
+#ifdef __INSIDE_MINIOS__
 #define current get_current()
 #endif
 
diff -r bec755616e8e -r 183d2d7adc2f extras/mini-os/minios.mk
--- a/extras/mini-os/minios.mk  Wed Oct 29 10:19:35 2008 +0000
+++ b/extras/mini-os/minios.mk  Wed Oct 29 12:04:38 2008 +0000
@@ -25,6 +25,9 @@ else
 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,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog