devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

#if => #ifdef

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12368 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2007-02-17 23:07:39 +00:00
parent 1916576728
commit 0c021deb05
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/codecs/spc.c
View file

@ -92,7 +92,7 @@ static inline void set_le16( void* p, unsigned n )
#define GET_LE16( addr ) get_le16( addr ) #define GET_LE16( addr ) get_le16( addr )
#define SET_LE16( addr, data ) set_le16( addr, data ) #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_LE16A( addr ) (*(uint16_t*) (addr))
#define GET_LE16SA( addr ) (*( int16_t*) (addr)) #define GET_LE16SA( addr ) (*( int16_t*) (addr))
#define SET_LE16A( addr, data ) (void) (*(uint16_t*) (addr) = (data)) #define SET_LE16A( addr, data ) (void) (*(uint16_t*) (addr) = (data))

4
apps/playlist.c
View file

@ -1056,7 +1056,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps,
} }
case REPEAT_ONE: case REPEAT_ONE:
#if (AB_REPEAT_ENABLE == 1) #ifdef AB_REPEAT_ENABLE
case REPEAT_AB: case REPEAT_AB:
#endif #endif
next_index = current_index; next_index = current_index;
@ -2479,7 +2479,7 @@ int playlist_next(int steps)
int index; int index;
if ( (steps > 0) if ( (steps > 0)
#if (AB_REPEAT_ENABLE == 1) #ifdef AB_REPEAT_ENABLE
&& (global_settings.repeat_mode != REPEAT_AB) && (global_settings.repeat_mode != REPEAT_AB)
#endif #endif
&& (global_settings.repeat_mode != REPEAT_ONE) ) && (global_settings.repeat_mode != REPEAT_ONE) )

2
apps/screen_access.h
View file

@ -96,7 +96,7 @@ struct screen
#if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1
unsigned (*color_to_native)(unsigned color); unsigned (*color_to_native)(unsigned color);
#endif #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_background)(void);
unsigned (*get_foreground)(void); unsigned (*get_foreground)(void);
void (*set_background)(unsigned background); void (*set_background)(unsigned background);

2
apps/screens.c
View file

@ -663,7 +663,7 @@ bool quick_screen_quick(int button_enter)
[REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) }, [REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) },
[REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) }, [REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) },
[REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) }, [REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) },
#if (AB_REPEAT_ENABLE == 1) #ifdef AB_REPEAT_ENABLE
[REPEAT_AB]={ STR(LANG_SYSFONT_REPEAT_AB) } [REPEAT_AB]={ STR(LANG_SYSFONT_REPEAT_AB) }
#endif #endif
}; };

6
apps/settings_list.c
View file

@ -387,17 +387,17 @@ const struct settings_list settings[] = {
SYSTEM_SETTING(NVRAM(4),resume_seed,-1), SYSTEM_SETTING(NVRAM(4),resume_seed,-1),
CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_ALL, "repeat", CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_ALL, "repeat",
"off,all,one,shuffle" "off,all,one,shuffle"
#if (AB_REPEAT_ENABLE == 1) #ifdef AB_REPEAT_ENABLE
",ab" ",ab"
#endif #endif
, NULL, , NULL,
#if (AB_REPEAT_ENABLE == 1) #ifdef AB_REPEAT_ENABLE
5, 5,
#else #else
4, 4,
#endif #endif
ID2P(LANG_OFF), ID2P(LANG_REPEAT_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE) 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) ,ID2P(LANG_REPEAT_AB)
#endif #endif
), /* CHOICE_SETTING( repeat_mode ) */ ), /* CHOICE_SETTING( repeat_mode ) */