1.1 --- a/extras/mini-os/Makefile	Wed Oct 29 10:19:35 2008 +0000
     1.2 +++ b/extras/mini-os/Makefile	Wed Oct 29 12:04:38 2008 +0000
     1.3 @@ -18,9 +18,6 @@ include minios.mk
     1.4  # Set tester flags
     1.5  # CFLAGS += -DBLKTEST_WRITE
     1.6  
     1.7 -# Make the headers define our internal stuff
     1.8 -CFLAGS += -D__MINIOS__
     1.9 -
    1.10  # Define some default flags for linking.
    1.11  LDLIBS := 
    1.12  APP_LDLIBS := 

     2.1 --- a/extras/mini-os/include/sched.h	Wed Oct 29 10:19:35 2008 +0000
     2.2 +++ b/extras/mini-os/include/sched.h	Wed Oct 29 12:04:38 2008 +0000
     2.3 @@ -48,7 +48,7 @@ struct thread* create_thread(char *name,
     2.4  void exit_thread(void) __attribute__((noreturn));
     2.5  void schedule(void);
     2.6  
     2.7 -#ifdef __MINIOS__
     2.8 +#ifdef __INSIDE_MINIOS__
     2.9  #define current get_current()
    2.10  #endif
    2.11  

     3.1 --- a/extras/mini-os/minios.mk	Wed Oct 29 10:19:35 2008 +0000
     3.2 +++ b/extras/mini-os/minios.mk	Wed Oct 29 12:04:38 2008 +0000
     3.3 @@ -26,6 +26,9 @@ else
     3.4  DEF_CFLAGS += -O3
     3.5  endif
     3.6  
     3.7 +# Make the headers define our internal stuff
     3.8 +DEF_CFLAGS += -D__INSIDE_MINIOS__
     3.9 +
    3.10  # Build the CFLAGS and ASFLAGS for compiling and assembling.
    3.11  # DEF_... flags are the common mini-os flags,
    3.12  # ARCH_... flags may be defined in arch/$(TARGET_ARCH_FAM/rules.mk