summaryrefslogtreecommitdiff
path: root/apps/gui/wps_parser.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-03-29 01:14:10 +0000
committerDave Chapman <dave@dchapman.com>2008-03-29 01:14:10 +0000
commitd746b793178cf3b55a1405bf97e07c2adeca9769 (patch)
treee5f1517a7c15417095c8eb7b264290840dc19e70 /apps/gui/wps_parser.c
parent2e45ca37ce287b05db12a41e5f81467e7f9e3d2a (diff)
downloadrockbox-d746b793178cf3b55a1405bf97e07c2adeca9769.zip
rockbox-d746b793178cf3b55a1405bf97e07c2adeca9769.tar.gz
rockbox-d746b793178cf3b55a1405bf97e07c2adeca9769.tar.bz2
rockbox-d746b793178cf3b55a1405bf97e07c2adeca9769.tar.xz
Remove unnecessary (and incorrect) #ifdefs surrounding #include "backdrop.h", and correct remaining references to HAVE_LCD_REMOTE to HAVE_REMOTE_LCD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16873 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r--apps/gui/wps_parser.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 9bbdb2e..f6b2178 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -47,9 +47,7 @@
#include "bmp.h"
#endif
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
#include "backdrop.h"
-#endif
#endif
@@ -329,7 +327,7 @@ static const struct wps_tag all_tags[] = {
{ WPS_NO_TOKEN, "V", 0, parse_viewport },
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
{ WPS_TOKEN_IMAGE_BACKDROP, "X", 0, parse_image_special },
#endif
#endif
@@ -1425,7 +1423,7 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir)
}
}
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
if (bmp_names[BACKDROP_BMP])
{
get_image_filename(bmp_names[BACKDROP_BMP], bmpdir,