From 112bc71a0c7d5a981d37eaa5062f8a93d7ccc067 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 29 Jan 2012 21:51:26 +0100 Subject: Fix building test plugins on non-touch targets, for real. Change-Id: I8f2105fe3357f00d9e085444cd867bec0e2a7143 --- apps/plugins/test_codec.c | 14 +++++--------- apps/plugins/test_fps.c | 13 +++++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index 50d3fc93ef..3e13842cfb 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c @@ -816,19 +816,15 @@ void cleanup(void) } #endif - -static struct touchbutton button[] = { - { - .action = ACTION_STD_OK, - .title = "OK", - /* viewport runtime initialized, rest false/NULL */ - } -}; - void plugin_quit(void) { int btn; #ifdef HAVE_TOUCHSCREEN + static struct touchbutton button[] = {{ + .action = ACTION_STD_OK, + .title = "OK", + /* viewport runtime initialized, rest false/NULL */ + }}; struct viewport *vp = &button[0].vp; struct screen *lcd = rb->screens[SCREEN_MAIN]; rb->viewport_set_defaults(vp, SCREEN_MAIN); diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index caabde4d1b..d5bfb55907 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c @@ -360,17 +360,14 @@ static void time_greyscale(void) } #endif -static struct touchbutton button[] = { - { - .action = ACTION_STD_OK, - .title = "OK", - /* viewport runtime initialized, rest false/NULL */ - } -}; - void plugin_quit(void) { #ifdef HAVE_TOUCHSCREEN + static struct touchbutton button[] = {{ + .action = ACTION_STD_OK, + .title = "OK", + /* .vp runtime initialized, rest false/NULL */ + }}; struct viewport *vp = &button[0].vp; struct screen *lcd = rb->screens[SCREEN_MAIN]; rb->viewport_set_defaults(vp, SCREEN_MAIN); -- cgit v1.2.3