summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/plugin.c2
-rw-r--r--apps/plugin.h2
-rw-r--r--uisimulator/common/lcd-common.c11
3 files changed, 2 insertions, 13 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index aa6b65a34a..57f836c5d2 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -122,7 +122,7 @@ static const struct plugin_api rockbox_api = {
|| defined (IRIVER_H10)
lcd_yuv_set_options,
#endif
-#elif (LCD_DEPTH < 4) || !defined(SIMULATOR)
+#elif (LCD_DEPTH < 4) && !defined(SIMULATOR)
lcd_blit_mono,
lcd_blit_grey_phase,
#endif /* LCD_DEPTH */
diff --git a/apps/plugin.h b/apps/plugin.h
index 1563ed3aec..cd426564ba 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -201,7 +201,7 @@ struct plugin_api {
|| defined (IRIVER_H10)
void (*lcd_yuv_set_options)(unsigned options);
#endif
-#elif (LCD_DEPTH < 4) || !defined(SIMULATOR)
+#elif (LCD_DEPTH < 4) && !defined(SIMULATOR)
void (*lcd_blit_mono)(const unsigned char *data, int x, int by, int width,
int bheight, int stride);
void (*lcd_blit_grey_phase)(unsigned char *values, unsigned char *phases,
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index eaadb20489..00a456507d 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -24,17 +24,6 @@
#include "lcd.h"
#include "lcd-sdl.h"
-void lcd_blit_mono(const unsigned char *data, int x, int y, int width, int height,
- int stride)
-{
- (void)data;
- (void)x;
- (void)y;
- (void)width;
- (void)height;
- (void)stride;
-}
-
void lcd_set_flip(bool yesno)
{
(void)yesno;