From: bernie Date: Tue, 20 Jul 2004 23:26:48 +0000 (+0000) Subject: Fix two errors introduced by previous commit. X-Git-Tag: 1.0.0~1173 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=52931926d11b65b932c7c5f55ce4566439d4593c;p=bertos.git Fix two errors introduced by previous commit. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@68 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/compiler.h b/compiler.h index 7b09e1fd..9496481d 100755 --- a/compiler.h +++ b/compiler.h @@ -15,8 +15,11 @@ /* * $Log$ + * Revision 1.7 2004/07/20 23:26:48 bernie + * Fix two errors introduced by previous commit. + * * Revision 1.6 2004/07/20 23:12:43 bernie - * Reverse the logic to provide defaults for undefined macros. + * *** empty log message *** * * Revision 1.5 2004/07/20 17:08:03 bernie * Cleanup documentation @@ -168,10 +171,10 @@ #ifndef FORMAT #define FORMAT(type,fmt,first) /* nothing */ #endif -#ifndef +#ifndef DEPRECATED #define DEPRECATED /* nothing */ #endif -#ifndef +#ifndef UNUSED #define UNUSED(type,arg) type arg #endif #ifndef REGISTER diff --git a/cpu.h b/cpu.h index 8d9ed1db..4715908b 100755 --- a/cpu.h +++ b/cpu.h @@ -17,6 +17,9 @@ /* * $Log$ + * Revision 1.7 2004/07/20 23:26:48 bernie + * Fix two errors introduced by previous commit. + * * Revision 1.6 2004/07/20 23:12:16 bernie * Rationalize and document SCHEDULER_IDLE. * @@ -228,7 +231,7 @@ * in hosted environments such as emulators. */ #ifndef SCHEDULER_IDLE - #if (ARCH & ARCH_EMUL) + #if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL) /* This emulator hook should yeld the CPU to the host. */ EXTERN_C_BEGIN void SchedulerIdle(void);