summaryrefslogtreecommitdiff
path: root/firmware/target/hosted/sdl/button-sdl.c
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2014-03-14 16:21:34 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-18 10:56:19 +0100
commit1cf17436b77659aa59e205c1dcf62b4fe485e95e (patch)
treeaa2428a0036ee4e3403eae617e40ec333a7158f9 /firmware/target/hosted/sdl/button-sdl.c
parent915bc0999676b1d42f8c9dd57e5911931cd34fcd (diff)
downloadrockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.tar.gz
rockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.zip
Fix (unintentional) linkage of HAVE_BUTTON_DATA with HAVE_TOUCHSCREEN
Defining HAVE_BUTTON_DATA without simultaneously defining HAVE_TOUCHSCREEN caused compile errors. (I need them separated for a scrollstrip driver.) Change-Id: I945d3437d840035ccc0c147f8155029b403c6ec2 Reviewed-on: http://gerrit.rockbox.org/771 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com> Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Diffstat (limited to 'firmware/target/hosted/sdl/button-sdl.c')
-rw-r--r--firmware/target/hosted/sdl/button-sdl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 9677f1dd23..2a3202b6bc 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -444,11 +444,15 @@ static void button_event(int key, bool pressed)
444 else 444 else
445 btn &= ~new_btn; 445 btn &= ~new_btn;
446} 446}
447#if defined(HAVE_BUTTON_DATA) && defined(HAVE_TOUCHSCREEN) 447#if defined(HAVE_BUTTON_DATA)
448int button_read_device(int* data) 448int button_read_device(int* data)
449{ 449{
450#if defined(HAVE_TOUCHSCREEN)
450 *data = mouse_coords; 451 *data = mouse_coords;
451#else 452#else
453 (void) *data; /* suppress compiler warnings */
454#endif
455#else
452int button_read_device(void) 456int button_read_device(void)
453{ 457{
454#endif 458#endif