summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-10-17 17:49:20 +0000
committerThomas Martitz <kugel@rockbox.org>2011-10-17 17:49:20 +0000
commit55f078f4b5d5636b6f0041718f4d5b0fb91b8f33 (patch)
tree0a16cdec9912738e93eddd7d1e6c1a35982361ab
parent3b12634e6bc966cb2b2e7f21e9a435cdd20f0bc4 (diff)
downloadrockbox-55f078f4b5d5636b6f0041718f4d5b0fb91b8f33.tar.gz
rockbox-55f078f4b5d5636b6f0041718f4d5b0fb91b8f33.zip
Fix checkwps reds and non-touchscreen warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30774 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_list.c3
-rw-r--r--tools/checkwps/checkwps.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index a3d6587d0c..7c5552a031 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -286,6 +286,8 @@ static const char graphic_numeric[] = "graphic,numeric";
#endif /* HAVE_RECORDING */
+#ifdef HAVE_TOUCHSCREEN
+
static const char* list_pad_formatter(char *buffer, size_t buffer_size,
int val, const char *unit)
{
@@ -309,6 +311,7 @@ static int32_t list_pad_getlang(int value, int unit)
}
}
+#endif /* HAVE_TOUCHSCREEN */
static const char* formatter_unit_0_is_off(char *buffer, size_t buffer_size,
int val, const char *unit)
{
diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c
index e104928909..7d63cb6654 100644
--- a/tools/checkwps/checkwps.c
+++ b/tools/checkwps/checkwps.c
@@ -220,6 +220,7 @@ bool radio_hardware_present(void)
#ifdef HAVE_LCD_BITMAP
static int loaded_fonts = 0;
+static struct font _font;
int font_load(const char *path)
{
int id = 2 + loaded_fonts;
@@ -231,6 +232,11 @@ void font_unload(int font_id)
{
(void)font_id;
}
+
+struct font* font_get(int font)
+{
+ return &_font;
+}
#endif
int main(int argc, char **argv)