diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-02-03 12:33:33 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-02-03 12:33:33 +0100 |
| commit | 10b3bc78f6e55a3a442f2da1f95f158ab158e648 (patch) | |
| tree | c14723a5b73dd576db3e1620ba1e3f75dc610626 | |
| parent | e5eb74592eeff013d818ff0c56692b220dd53fbc (diff) | |
| download | rockbox-10b3bc7.tar.gz rockbox-10b3bc7.zip | |
Fix warnings.
Change-Id: If3cbcd7557797684f1b7fea8e1bb134777680dee
| -rw-r--r-- | apps/talk.c | 2 | ||||
| -rw-r--r-- | apps/voice_thread.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/talk.c b/apps/talk.c index ab9ca8c495..13f323f4b6 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -312,6 +312,7 @@ static int id2index(int id) return index; } +#ifndef TALK_PROGRESSIVE_LOAD static int index2id(int index) { int id = index; @@ -329,6 +330,7 @@ static int index2id(int index) return id; } +#endif static int free_oldest_clip(void) { diff --git a/apps/voice_thread.c b/apps/voice_thread.c index dcb7eef224..d8a7b27d14 100644 --- a/apps/voice_thread.c +++ b/apps/voice_thread.c @@ -458,7 +458,7 @@ static enum voice_state voice_decode(struct voice_thread_data *td) else { if (td->vi.size > VOICE_MAX_ENCODED_FRAME_SIZE - && td->bits.charPtr > (td->vi.size - VOICE_MAX_ENCODED_FRAME_SIZE) + && td->bits.charPtr > (int)(td->vi.size - VOICE_MAX_ENCODED_FRAME_SIZE) && td->vi.get_more != NULL) { /* request more data _before_ running out of data (requesting |