4 files changed, 16 insertions, 16 deletions

diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index 960bbdb313..25baeb2c3c 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -40,18 +40,18 @@
 
 static bool skins_initialising = true;
 
-/* Hosted platforms use the host malloc to manage the buffer */
-#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
-static char *skin_buffer = NULL;
+/* App uses the host malloc to manage the buffer */
+#ifdef APPLICATION
+#define skin_buffer NULL
 void theme_init_buffer(void)
 {
-    skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE);
     skins_initialising = false;
 }
-#else 
-#define skin_buffer NULL
+#else
+static char *skin_buffer = NULL;
 void theme_init_buffer(void)
 {
+    skin_buffer = buffer_alloc(SKIN_BUFFER_SIZE);
     skins_initialising = false;
 }
 #endif
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index c0ea3e3ca9..ad3e7e48ce 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1613,13 +1613,13 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
     wps_data->backdrop_id = -1;
 #endif
     /* parse the skin source */
-#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
+#ifndef APPLICATION
     skin_buffer_save_position();
 #endif
     wps_data->tree = skin_parse(wps_buffer, skin_element_callback, wps_data);
     if (!wps_data->tree) {
         skin_data_reset(wps_data);
-#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
+#ifndef APPLICATION
         skin_buffer_restore_position();
 #endif
         return false;
@@ -1643,7 +1643,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
         !skin_load_fonts(wps_data)) 
     {
         skin_data_reset(wps_data);
-#if ((CONFIG_PLATFORM&PLATFORM_HOSTED) == 0)
+#ifndef APPLICATION
         skin_buffer_restore_position();
 #endif
         return false;
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);
diff --git a/lib/skin_parser/skin_buffer.c b/lib/skin_parser/skin_buffer.c
index 05a46658d4..0045b3c4c7 100644
--- a/lib/skin_parser/skin_buffer.c
+++ b/lib/skin_parser/skin_buffer.c
@@ -46,11 +46,11 @@
 #ifdef ROCKBOX
 #include "config.h"
 
-# if (CONFIG_PLATFORM&PLATFORM_HOSTED)
+#ifdef APPLICATION
 #   define USE_HOST_MALLOC
-# else
+#else
 #   define USE_ROCKBOX_ALLOC
-# endif
+#endif
 
 #endif