From f1b8134f6c1c888326c1d9ef978acc1e4aed478e Mon Sep 17 00:00:00 2001
From: gevaerts <gevaerts@a1c6a512-1295-4272-9138-f99709370657>
Date: Fri, 7 May 2010 20:11:14 +0000
Subject: [PATCH] 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
---
 apps/plugins/doom/doom.make   | 2 +-
 apps/plugins/midi/midiutil.c  | 6 +++---
 apps/plugins/zxbox/zxbox.make | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make
index 54a63eb70..2f52da4a4 100644
--- a/apps/plugins/doom/doom.make
+++ b/apps/plugins/doom/doom.make
@@ -19,7 +19,7 @@ DOOM_OBJ := $(call c2obj, $(DOOM_SRC))
 # add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(DOOM_SRC)
 
-DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2
+DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing
 
 ifndef SIMVER
 ifeq ($(TARGET), IRIVER_H100)
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index 87e0f9d9a..acb155826 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");
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make
index 04c85407e..c209d20ca 100644
--- a/apps/plugins/zxbox/zxbox.make
+++ b/apps/plugins/zxbox/zxbox.make
@@ -30,7 +30,7 @@ else
     ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock
 endif
 
-ZXBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 -funroll-loops
+ZXBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 -funroll-loops -fno-strict-aliasing
 
 $(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ)
 
-- 
2.11.4.GIT