summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-02-17 23:07:39 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-02-17 23:07:39 +0000
commit0c021deb05107afc6826b255feb3b1c512a26ca5 (patch)
tree0dd04469d9ee04b9496a9e53d308718591fa48a0 /apps
parent1916576728f8e3b84eab8044e5f2a01ee3d6d943 (diff)
downloadrockbox-0c021deb05107afc6826b255feb3b1c512a26ca5.tar.gz
rockbox-0c021deb05107afc6826b255feb3b1c512a26ca5.tar.bz2
rockbox-0c021deb05107afc6826b255feb3b1c512a26ca5.zip
#if => #ifdef
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12368 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/spc.c2
-rw-r--r--apps/playlist.c4
-rw-r--r--apps/screen_access.h2
-rw-r--r--apps/screens.c2
-rw-r--r--apps/settings_list.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c
index 2dac1d4e61..604529109e 100644
--- a/apps/codecs/spc.c
+++ b/apps/codecs/spc.c
@@ -92,7 +92,7 @@ static inline void set_le16( void* p, unsigned n )
#define GET_LE16( addr ) get_le16( addr )
#define SET_LE16( addr, data ) set_le16( addr, data )
-#if ROCKBOX_LITTLE_ENDIAN
+#ifdef ROCKBOX_LITTLE_ENDIAN
#define GET_LE16A( addr ) (*(uint16_t*) (addr))
#define GET_LE16SA( addr ) (*( int16_t*) (addr))
#define SET_LE16A( addr, data ) (void) (*(uint16_t*) (addr) = (data))
diff --git a/apps/playlist.c b/apps/playlist.c
index 56ffccc474..6997b12675 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -1056,7 +1056,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps,
}
case REPEAT_ONE:
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
case REPEAT_AB:
#endif
next_index = current_index;
@@ -2479,7 +2479,7 @@ int playlist_next(int steps)
int index;
if ( (steps > 0)
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
&& (global_settings.repeat_mode != REPEAT_AB)
#endif
&& (global_settings.repeat_mode != REPEAT_ONE) )
diff --git a/apps/screen_access.h b/apps/screen_access.h
index eea15e86a5..54f2d64fdb 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -96,7 +96,7 @@ struct screen
#if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1
unsigned (*color_to_native)(unsigned color);
#endif
-#if (LCD_DEPTH > 1) || (LCD_REMOTE_DEPTH > 1)
+#if (LCD_DEPTH > 1) || (defined(LCD_REMOTE_DEPTH) && (LCD_REMOTE_DEPTH > 1))
unsigned (*get_background)(void);
unsigned (*get_foreground)(void);
void (*set_background)(unsigned background);
diff --git a/apps/screens.c b/apps/screens.c
index b5e22fded5..d74b7c193c 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -663,7 +663,7 @@ bool quick_screen_quick(int button_enter)
[REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) },
[REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) },
[REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) },
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
[REPEAT_AB]={ STR(LANG_SYSFONT_REPEAT_AB) }
#endif
};
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 0d84408346..37fa7c53c3 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -387,17 +387,17 @@ const struct settings_list settings[] = {
SYSTEM_SETTING(NVRAM(4),resume_seed,-1),
CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_ALL, "repeat",
"off,all,one,shuffle"
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
",ab"
#endif
, NULL,
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
5,
#else
4,
#endif
ID2P(LANG_OFF), ID2P(LANG_REPEAT_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE)
-#if (AB_REPEAT_ENABLE == 1)
+#ifdef AB_REPEAT_ENABLE
,ID2P(LANG_REPEAT_AB)
#endif
), /* CHOICE_SETTING( repeat_mode ) */