diff options
author | Thom Johansen <thomj@rockbox.org> | 2006-01-19 09:42:28 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2006-01-19 09:42:28 +0000 |
commit | bb164ee43f6776b5edbbf8c93bd65191e94dc64c (patch) | |
tree | e6f9fe87dda19165a90b84a60c0cde96abe26854 /apps/gui | |
parent | cdacab3d89cdbbd8fd7c20b3b340e27352e6737e (diff) | |
download | rockbox-bb164ee43f6776b5edbbf8c93bd65191e94dc64c.tar.gz rockbox-bb164ee43f6776b5edbbf8c93bd65191e94dc64c.zip |
Attempt fix to broken builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8384 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 4 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 37f4fea310..b2d06bc61f 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -652,7 +652,8 @@ static char* get_tag(struct wps_data* wps_data, | |||
652 | strncpy(buf, "?h ?m", buf_size); | 652 | strncpy(buf, "?h ?m", buf_size); |
653 | return buf; | 653 | return buf; |
654 | } | 654 | } |
655 | 655 | ||
656 | #ifdef HAVE_CHARGING | ||
656 | case 'p': /* External power plugged in? */ | 657 | case 'p': /* External power plugged in? */ |
657 | { | 658 | { |
658 | if(charger_input_state==CHARGER) | 659 | if(charger_input_state==CHARGER) |
@@ -660,6 +661,7 @@ static char* get_tag(struct wps_data* wps_data, | |||
660 | else | 661 | else |
661 | return NULL; | 662 | return NULL; |
662 | } | 663 | } |
664 | #endif | ||
663 | #if defined(HAVE_CHARGE_CTRL) || \ | 665 | #if defined(HAVE_CHARGE_CTRL) || \ |
664 | defined (HAVE_CHARGE_STATE) || \ | 666 | defined (HAVE_CHARGE_STATE) || \ |
665 | CONFIG_BATTERY == BATT_LIION2200 | 667 | CONFIG_BATTERY == BATT_LIION2200 |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index b4070394f9..d8e611af85 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -127,7 +127,9 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
127 | #endif /* HAVE_LCD_CHARCELLS */ | 127 | #endif /* HAVE_LCD_CHARCELLS */ |
128 | 128 | ||
129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); | 129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); |
130 | #ifdef HAVE_CHARGING | ||
130 | bar->info.inserted = (charger_input_state == CHARGER); | 131 | bar->info.inserted = (charger_input_state == CHARGER); |
132 | #endif | ||
131 | bar->info.battlevel = battery_level(); | 133 | bar->info.battlevel = battery_level(); |
132 | bar->info.battery_safe = battery_level_safe(); | 134 | bar->info.battery_safe = battery_level_safe(); |
133 | 135 | ||