diff -r 4a8fed1c0ef6 -r 597aaf25e343 kernel/eka/include/nkern/nk_trace.h --- a/kernel/eka/include/nkern/nk_trace.h Sat Feb 20 00:10:51 2010 +0200 +++ b/kernel/eka/include/nkern/nk_trace.h Fri Mar 12 15:50:11 2010 +0200 @@ -574,7 +574,7 @@ @publishedPartner @released 9.4 */ -#if defined(__MEMMODEL_MOVING__) || defined (__MEMMODEL_MULTIPLE__) +#if !defined(__MEMMODEL_DIRECT__) && !defined (__MEMMODEL_EMUL_SINGLE_HOST_PROCESS__) #define BTRACE_RAM_ALLOCATOR #endif @@ -620,7 +620,9 @@ This BTrace category is only supported on the flexible memory model. */ +#ifdef __MEMMODEL_FLEXIBLE__ #define BTRACE_FLEXIBLE_MEM_MODEL +#endif /** If defined, code for BTrace category BTrace::EIic is compiled into the