diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/action.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/action.c')
-rw-r--r-- | apps/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/action.c b/apps/action.c index 2aee56ee04..0c55227aac 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "config.h" | 26 | #include "config.h" |
27 | #include "lang.h" | 27 | #include "lang.h" |
28 | 28 | ||
29 | #if defined(HAVE_LCD_BITMAP) && !defined(BOOTLOADER) | 29 | #if !defined(BOOTLOADER) |
30 | #include "language.h" | 30 | #include "language.h" |
31 | #endif | 31 | #endif |
32 | 32 | ||
@@ -421,7 +421,7 @@ static inline bool get_action_touchscreen(action_last_t *last, action_cur_t *cur | |||
421 | static inline void button_flip_horizontally(int context, int *button) | 421 | static inline void button_flip_horizontally(int context, int *button) |
422 | { | 422 | { |
423 | 423 | ||
424 | #if !defined(HAVE_LCD_BITMAP) || defined(BOOTLOADER) | 424 | #if defined(BOOTLOADER) |
425 | (void) context; | 425 | (void) context; |
426 | (void) *button; | 426 | (void) *button; |
427 | return; | 427 | return; |
@@ -473,7 +473,7 @@ static inline void button_flip_horizontally(int context, int *button) | |||
473 | #endif /* !SIMULATOR */ | 473 | #endif /* !SIMULATOR */ |
474 | 474 | ||
475 | *button = newbutton; | 475 | *button = newbutton; |
476 | #endif /* !HAVE_LCD_BITMAP | BOOTLOADER */ | 476 | #endif /* !BOOTLOADER */ |
477 | } /* button_flip_horizontally */ | 477 | } /* button_flip_horizontally */ |
478 | 478 | ||
479 | /********************************************************************** | 479 | /********************************************************************** |