summaryrefslogtreecommitdiffstats
path: root/apps/plugins/midi/midiutil.c
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2010-05-07 20:11:14 +0000
committerFrank Gevaerts <frank@gevaerts.be>2010-05-07 20:11:14 +0000
commit7a994c1e7d5ca431a46b80c98ae9413799c57c55 (patch)
tree95eefa43ad39a90ac61cc3a39f73243279a90755 /apps/plugins/midi/midiutil.c
parent91249a5c7d5a262bd5831470b0047ad1de1c9230 (diff)
downloadrockbox-7a994c1e7d5ca431a46b80c98ae9413799c57c55.tar.gz
rockbox-7a994c1e7d5ca431a46b80c98ae9413799c57c55.tar.bz2
rockbox-7a994c1e7d5ca431a46b80c98ae9413799c57c55.zip
Fix (hopefully) last aliasing bug (midiutil), and enable -fno-strict-aliasing again for zxbox and doom (no easy fix there)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25889 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/midi/midiutil.c')
-rw-r--r--apps/plugins/midi/midiutil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index 87e0f9d9a4..acb1558268 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -40,7 +40,7 @@ struct SynthObject voices[MAX_VOICES] IBSS_ATTR;
void *alloc(int size)
{
static char *offset = NULL;
- static ssize_t totalSize = 0;
+ static size_t totalSize = 0;
char *ret;
int remainder = size % 4;
@@ -49,10 +49,10 @@ void *alloc(int size)
if (offset == NULL)
{
- offset = rb->plugin_get_audio_buffer((size_t *)&totalSize);
+ offset = rb->plugin_get_audio_buffer(&totalSize);
}
- if (size + 4 > totalSize)
+ if (size + 4 > (int)totalSize)
{
printf("MALLOC BARF");
printf("MALLOC BARF");