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) | |
download | rockbox-921ffe7111813804feee69047a2461328b930901.tar.gz rockbox-921ffe7111813804feee69047a2461328b930901.zip |
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); | |||
567 | static void process_input(int); | 567 | static void process_input(int); |
568 | 568 | ||
569 | /*Helper functions*/ | 569 | /*Helper functions*/ |
570 | static void pause(void); | 570 | static void rfkpause(void); |
571 | static int validchar(char); | 571 | static int validchar(char); |
572 | static void play_animation(int); | 572 | static void play_animation(int); |
573 | 573 | ||
@@ -715,7 +715,7 @@ static void process_input(int input) | |||
715 | case KITTEN: /*Found it!*/ | 715 | case KITTEN: /*Found it!*/ |
716 | play_animation(input); | 716 | play_animation(input); |
717 | /* Wait for the user to click something */ | 717 | /* Wait for the user to click something */ |
718 | pause(); | 718 | rfkpause(); |
719 | break; | 719 | break; |
720 | default: /*We hit a bogus object; print its message.*/ | 720 | default: /*We hit a bogus object; print its message.*/ |
721 | message(messages[bogus_messages[screen[check_x][check_y]-2]]); | 721 | message(messages[bogus_messages[screen[check_x][check_y]-2]]); |
@@ -743,7 +743,7 @@ static void finish(int sig) | |||
743 | * | 743 | * |
744 | *****************************************************************************/ | 744 | *****************************************************************************/ |
745 | 745 | ||
746 | static void pause() | 746 | static void rfkpause() |
747 | { | 747 | { |
748 | int button; | 748 | int button; |
749 | rb->lcd_update(); | 749 | rb->lcd_update(); |
@@ -831,7 +831,7 @@ static void instructions() | |||
831 | "Press", "any", "key", "to", "start", | 831 | "Press", "any", "key", "to", "start", |
832 | }; | 832 | }; |
833 | display_text(ARRAYLEN(help_text), help_text, NULL, NULL, false); | 833 | display_text(ARRAYLEN(help_text), help_text, NULL, NULL, false); |
834 | pause(); | 834 | rfkpause(); |
835 | } | 835 | } |
836 | 836 | ||
837 | static void initialize_arrays() | 837 | static void initialize_arrays() |