diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-21 10:08:34 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-21 10:08:34 +0000 |
commit | 080a746ce32e70a83d7026c62894cb8d1d35ecd8 (patch) | |
tree | b9c86ee3334c6d25dfc26454d5924a8a02196669 | |
parent | f78bcb165f7be0459ac951d7d71e24907febc32b (diff) | |
download | rockbox-080a746ce32e70a83d7026c62894cb8d1d35ecd8.tar.gz rockbox-080a746ce32e70a83d7026c62894cb8d1d35ecd8.zip |
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
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.h | 14 |
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, | |||
206 | switch (skin) | 206 | switch (skin) |
207 | { | 207 | { |
208 | case CUSTOM_STATUSBAR: | 208 | case CUSTOM_STATUSBAR: |
209 | #ifdef HAVE_LCD_BITMAP | ||
209 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 210 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 |
210 | if (screen == SCREEN_REMOTE) | 211 | if (screen == SCREEN_REMOTE) |
211 | { | 212 | { |
@@ -218,6 +219,7 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
218 | setting = global_settings.sbs_file; | 219 | setting = global_settings.sbs_file; |
219 | ext = "sbs"; | 220 | ext = "sbs"; |
220 | } | 221 | } |
222 | #endif | ||
221 | break; | 223 | break; |
222 | case WPS: | 224 | case WPS: |
223 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 225 | #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 { | |||
40 | SKINNABLE_SCREENS_COUNT | 40 | SKINNABLE_SCREENS_COUNT |
41 | }; | 41 | }; |
42 | 42 | ||
43 | |||
44 | #ifdef HAVE_LCD_BITMAP | ||
45 | |||
46 | #define SKIN_BUFFER_SIZE (WPS_MAX_TOKENS * \ | ||
47 | (sizeof(struct wps_token) + (sizeof(struct skin_element)))) | ||
48 | #endif | ||
49 | |||
50 | #ifdef HAVE_LCD_CHARCELLS | ||
51 | #define SKIN_BUFFER_SIZE (LCD_HEIGHT * LCD_WIDTH) * 64 + \ | ||
52 | (WPS_MAX_TOKENS * \ | ||
53 | (sizeof(struct wps_token) + (sizeof(struct skin_element)))) | ||
54 | #endif | ||
55 | |||
56 | |||
57 | #ifdef HAVE_TOUCHSCREEN | 43 | #ifdef HAVE_TOUCHSCREEN |
58 | int skin_get_touchaction(struct wps_data *data, int* edge_offset, | 44 | int skin_get_touchaction(struct wps_data *data, int* edge_offset, |
59 | struct touchregion **retregion); | 45 | struct touchregion **retregion); |