From 4e0b47cb4e9eab694a9435f89f3558892155a8ef Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 7 Jun 2010 04:00:39 +0000 Subject: this should be the last of the warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26643 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/viewport.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 2dce3a3..c0fad83 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, -- cgit v1.1