summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-07 04:00:39 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-07 04:00:39 +0000
commit4e0b47cb4e9eab694a9435f89f3558892155a8ef (patch)
treecde5b1113e5fd1652392884300ecdea95c66a873
parent32455131e733d1c77e56441b19513148015b8429 (diff)
downloadrockbox-4e0b47cb4e9eab694a9435f89f3558892155a8ef.tar.gz
rockbox-4e0b47cb4e9eab694a9435f89f3558892155a8ef.tar.bz2
rockbox-4e0b47cb4e9eab694a9435f89f3558892155a8ef.zip
this should be the last of the warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26643 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/viewport.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 2dce3a397b..c0fad8355c 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -379,9 +379,9 @@ void viewport_set_defaults(struct viewport *vp,
int get_viewport_default_colour(enum screen_type screen, bool fgcolour)
{
- (void)screen;
- int colour;
+ (void)screen; (void)fbcolour;
#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
+ int colour;
if (fgcolour)
{
#if (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)
@@ -408,8 +408,10 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour)
colour = BG_FALLBACK;
#endif
}
-#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
return colour;
+#else
+ return 0;
+#endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */
}
const char* viewport_parse_viewport(struct viewport *vp,