diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-01-22 16:55:59 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-01-22 16:55:59 +0000 |
| commit | aed62058317e06c5ae9d156f8a5b361a37efbdd5 (patch) | |
| tree | 979ae99515ea122bda1d05581cac88c1d41f7b0b /apps | |
| parent | 3ff2fb37c97ba513bf54187a6805aa7f63660857 (diff) | |
| download | rockbox-aed62058317e06c5ae9d156f8a5b361a37efbdd5.zip rockbox-aed62058317e06c5ae9d156f8a5b361a37efbdd5.tar.gz rockbox-aed62058317e06c5ae9d156f8a5b361a37efbdd5.tar.bz2 rockbox-aed62058317e06c5ae9d156f8a5b361a37efbdd5.tar.xz | |
Declaration of 'pause' from chessclock is redeclared as different kind of symbol by android-ndk-r5
Flyspray: FS#11900
Author: Benjamin Brown
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29112 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/chessclock.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 1fd01d3..d50310f 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -372,7 +372,7 @@ static int chessclock_set_int(char* string, static char * show_time(int secs); -static bool pause; +static bool chesspause; #define MAX_TIME 7200 @@ -436,7 +436,7 @@ enum plugin_status plugin_start(const void* parameter) timer_holder[i].hidden=false; } - pause=true; /* We start paused */ + chesspause=true; /* We start paused */ nr=0; do { @@ -511,7 +511,7 @@ static int run_timer(int nr) long ticks=0; bool round_time=false; - show_pause_mode(pause); + show_pause_mode(chesspause); if (settings.round_time*HZ<max_ticks) { max_ticks=settings.round_time*HZ; @@ -533,7 +533,7 @@ static int run_timer(int nr) ticks = max_ticks; } else { now=*rb->current_tick; - if (!pause) { + if (!chesspause) { ticks+=now-last_tick; if ((max_ticks-ticks)/HZ == 10) { /* Backlight on if 10 seconds remain */ @@ -565,8 +565,8 @@ static int run_timer(int nr) /* PLAY = Stop/Start toggle */ case CHC_STARTSTOP: - pause=!pause; - show_pause_mode(pause); + chesspause=!chesspause; + show_pause_mode(chesspause); break; /* LEFT = Reset timer */ @@ -633,7 +633,7 @@ static int run_timer(int nr) break; } rb->lcd_clear_display(); - show_pause_mode(pause); + show_pause_mode(chesspause); rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info); } break; |