diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 19:12:23 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-11-05 19:12:23 +0000 |
| commit | 5411e14c57185b2b33fbfbb7ff7fec8ca2700551 (patch) | |
| tree | 41149a1100c3ba708e0065cd7409c2e14ac976b2 /apps/menus/main_menu.c | |
| parent | d98f2929e9c07505056d846d1d309f1e16694ce7 (diff) | |
| download | rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.tar.gz rockbox-5411e14c57185b2b33fbfbb7ff7fec8ca2700551.zip | |
Undo the part of r28480 that caused the simulator to also use host malloc.
We want simulators to simulate target code where possible, that includes memory constraints and memory allocation schemes. It also removed the sim's ability to show the theme's ram usage.
Use malloc only in application builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28498 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
| -rw-r--r-- | apps/menus/main_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 98f664eda6..54fdb55b09 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -147,7 +147,7 @@ enum infoscreenorder INFO_DISK1, /* capacity or internal capacity/free on hotswap */ INFO_DISK2, /* free space or external capacity/free on hotswap */ INFO_BUFFER, -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION INFO_SKIN_USAGE, /* ram usage of the skins */ #endif INFO_VERSION, @@ -159,7 +159,7 @@ static const char* info_getname(int selected_item, void *data, { struct info_data *info = (struct info_data*)data; char s1[32]; -#if defined(HAVE_MULTIVOLUME) || ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#if defined(HAVE_MULTIVOLUME) || !defined(APPLICATION) char s2[32]; #endif if (info->new_data) @@ -246,7 +246,7 @@ static const char* info_getname(int selected_item, void *data, snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); #endif break; -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION case INFO_SKIN_USAGE: output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true); output_dyn_value(s2, sizeof s2, skin_buffer_usage() @@ -334,7 +334,7 @@ static int info_speak_item(int selected_item, void * data) output_dyn_value(NULL, 0, info->size, kbyte_units, true); #endif break; -#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0) +#ifndef APPLICATION case INFO_SKIN_USAGE: talk_id(LANG_SKIN_RAM_USAGE, false); output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true); |