Fix the charcell compile error and rmeove an unused #define

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31039 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 2 insertions, 14 deletions

diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index 68d5c9c060..0186471550 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -206,6 +206,7 @@ static char* get_skin_filename(char *buf, size_t buf_size,
     switch (skin)
     {
         case CUSTOM_STATUSBAR:
+#ifdef HAVE_LCD_BITMAP
 #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1
             if (screen == SCREEN_REMOTE)
             {
@@ -218,6 +219,7 @@ static char* get_skin_filename(char *buf, size_t buf_size,
                 setting = global_settings.sbs_file;
                 ext = "sbs";
             }
+#endif
             break;
         case WPS:
 #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index 6338d7710a..7a41063af9 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -40,20 +40,6 @@ enum skinnable_screens {
     SKINNABLE_SCREENS_COUNT
 };
 
-
-#ifdef HAVE_LCD_BITMAP
-
-#define SKIN_BUFFER_SIZE (WPS_MAX_TOKENS * \
-                         (sizeof(struct wps_token) + (sizeof(struct skin_element))))
-#endif
-
-#ifdef HAVE_LCD_CHARCELLS
-#define SKIN_BUFFER_SIZE (LCD_HEIGHT * LCD_WIDTH) * 64 + \
-                         (WPS_MAX_TOKENS * \
-                         (sizeof(struct wps_token) + (sizeof(struct skin_element))))
-#endif
-
-
 #ifdef HAVE_TOUCHSCREEN
 int skin_get_touchaction(struct wps_data *data, int* edge_offset,
                          struct touchregion **retregion);