diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-01-22 18:27:05 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-01-22 18:27:05 +0000 |
| commit | 921ffe7111813804feee69047a2461328b930901 (patch) | |
| tree | 23d7298c39e8d079773047dc189ad9e5fc28eacb | |
| parent | 98246b82b912c26d17060b5aeb5443279b97cd24 (diff) | |
Declaration of 'pause' from robotfindskitten has conflicting types for 'pause' from android-ndk-r5
Flyspray: FS#11901
Author: Benjamin Brown
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29114 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/robotfindskitten.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c index 8426f35850..8314839015 100644 --- a/apps/plugins/robotfindskitten.c +++ b/apps/plugins/robotfindskitten.c @@ -567,7 +567,7 @@ static void play_game(void); static void process_input(int); /*Helper functions*/ -static void pause(void); +static void rfkpause(void); static int validchar(char); static void play_animation(int); @@ -715,7 +715,7 @@ static void process_input(int input) case KITTEN: /*Found it!*/ play_animation(input); /* Wait for the user to click something */ - pause(); + rfkpause(); break; default: /*We hit a bogus object; print its message.*/ message(messages[bogus_messages[screen[check_x][check_y]-2]]); @@ -743,7 +743,7 @@ static void finish(int sig) * *****************************************************************************/ -static void pause() +static void rfkpause() { int button; rb->lcd_update(); @@ -831,7 +831,7 @@ static void instructions() "Press", "any", "key", "to", "start", }; display_text(ARRAYLEN(help_text), help_text, NULL, NULL, false); - pause(); + rfkpause(); } static void initialize_arrays() |