summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-07-25 17:07:56 +0000
committerThomas Martitz <kugel@rockbox.org>2010-07-25 17:07:56 +0000
commit4e8ef935097cc0571e0eb6e34071753dbb763cfc (patch)
tree7eb849bf6729b639107af6622ad640ad79bfad92
parentc853097c2a43ac25bf4ffc31b8bbca08735fed85 (diff)
downloadrockbox-4e8ef935097cc0571e0eb6e34071753dbb763cfc.tar.gz
rockbox-4e8ef935097cc0571e0eb6e34071753dbb763cfc.tar.bz2
rockbox-4e8ef935097cc0571e0eb6e34071753dbb763cfc.zip
Rockbox as an application: Fix a few yellows
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27558 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/debug_menu.c6
-rw-r--r--apps/main.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index ec30477698..ca06907618 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -460,7 +460,7 @@ static bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device,
}
#endif /* (CONFIG_CPU == SH7034 || CPU_COLDFIRE) */
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
#ifdef CPU_PP
static int perfcheck(void)
{
@@ -663,7 +663,7 @@ static bool dbg_hw_info(void)
while (!(action_userabort(TIMEOUT_BLOCK)));
-#elif (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#else
/* Define this function in your target tree */
return __dbg_hw_info();
#endif /* CONFIG_CPU */
@@ -756,7 +756,7 @@ static bool dbg_hw_info(void)
return false;
}
#endif /* !HAVE_LCD_BITMAP */
-#endif /* !SIMULATOR */
+#endif /* PLATFORM_NATIVE */
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
static const char* dbg_partitions_getname(int selected_item, void *data,
diff --git a/apps/main.c b/apps/main.c
index b3252d8bd8..f1f30ce2b5 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -112,9 +112,10 @@
#include "m5636.h"
#endif
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
#include "sim_tasks.h"
#endif
+
#ifdef HAVE_SDL
#include "system-sdl.h"
#endif