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
This commit is contained in:
Jonathan Gordon 2011-11-21 10:08:34 +00:00
parent f78bcb165f
commit 080a746ce3
2 changed files with 2 additions and 14 deletions

View file

@ -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

View file

@ -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);