From 35e8b1429a2cdcf6580f6d25890fed9865165d0b Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 21 Jun 2010 16:53:00 +0000 Subject: Rockbox as an application: Replace many occurences of #ifdef SIMULATOR with #if (CONFIG_PLATFORM & PLATFORM_HOSTED) (or equivalently). The simulator defines PLATFORM_HOSTED, as RaaA will do (RaaA will not define SIMULATOR). The new define is to (de-)select code to compile on hosted platforms generally. Should be no functional change to targets or the simulator. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27019 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/lib/SOURCES | 2 +- apps/codecs/lib/tlsf/src/tlsf.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/codecs/lib') diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES index da77f97d30..49e744721d 100644 --- a/apps/codecs/lib/SOURCES +++ b/apps/codecs/lib/SOURCES @@ -24,6 +24,6 @@ setjmp_cf.S setjmp_mips.S #endif -#elif defined(SIMULATOR) && defined(__APPLE__) +#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) osx.dummy.c #endif diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/apps/codecs/lib/tlsf/src/tlsf.c index 570e472607..87f8d262ee 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.c +++ b/apps/codecs/lib/tlsf/src/tlsf.c @@ -104,6 +104,7 @@ #include #endif +#include "config.h" #include "tlsf.h" #if !defined(__GNUC__) @@ -164,7 +165,8 @@ #define PAGE_SIZE (getpagesize()) #endif -#if defined(ROCKBOX) && defined(SIMULATOR) || !defined(ROCKBOX) +#if defined(ROCKBOX) && (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(DEBUG) \ + || !defined(ROCKBOX) int printf(const char* fmt, ...); #define PRINT_MSG(fmt, args...) printf(fmt, ## args) #define ERROR_MSG(fmt, args...) printf(fmt, ## args) -- cgit v1.2.3