# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1181980793 -32400
# Node ID 6d749f573b3b25193335f4b9e494e9a9c3adb7b9
# Parent  6d03915421e20d2ee4a485e7d8d9075fb495f4b9
suppress warnings.

diff -r 6d03915421e2 -r 6d749f573b3b src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Thu Jun 14 23:21:43 2007 -0500
+++ b/src/console/Audacious_Driver.cxx	Sat Jun 16 16:59:53 2007 +0900
@@ -500,7 +500,7 @@
 {
 	NULL,
 	NULL,
-	"Game console audio module decoder",
+	(gchar *)"Game console audio module decoder",
 	console_init,
 	console_aboutbox,
 	console_cfg_ui,
diff -r 6d03915421e2 -r 6d749f573b3b src/flac/libflac/memory.c
--- a/src/flac/libflac/memory.c	Thu Jun 14 23:21:43 2007 -0500
+++ b/src/flac/libflac/memory.c	Sat Jun 16 16:59:53 2007 +0900
@@ -35,6 +35,7 @@
 
 #include "private/memory.h"
 #include "FLAC/assert.h"
+#include <malloc.h>
 
 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
 {
@@ -44,6 +45,7 @@
 
 #ifdef FLAC__ALIGN_MALLOC_DATA
 	/* align on 32-byte (256-bit) boundary */
+#if 0
 	x = malloc(bytes+31);
 	/* there's got to be a better way to do this right for all archs */
 	if(sizeof(void*) == sizeof(unsigned))
@@ -52,6 +54,10 @@
 		*aligned_address = (void*)(((FLAC__uint64)x + 31) & (FLAC__uint64)(-((FLAC__int64)32)));
 	else
 		return 0;
+#endif
+	x = memalign(32, bytes);
+	*aligned_address = x;
+
 #else
 	x = malloc(bytes);
 	*aligned_address = x;
diff -r 6d03915421e2 -r 6d749f573b3b src/musepack/libmpc.cxx
--- a/src/musepack/libmpc.cxx	Thu Jun 14 23:21:43 2007 -0500
+++ b/src/musepack/libmpc.cxx	Sat Jun 16 16:59:53 2007 +0900
@@ -13,7 +13,7 @@
 InputPlugin MpcPlugin = {
     NULL,           //File Handle               FILE* handle
     NULL,           //Filename                  char* filename
-    "Musepack Audio Plugin",
+    (gchar *)"Musepack Audio Plugin",
     mpcOpenPlugin,  //Open Plugin               [CALLBACK]
     mpcAboutBox,    //Show About box            [CALLBACK]
     mpcConfigBox,   //Show Configure box        [CALLBACK]
diff -r 6d03915421e2 -r 6d749f573b3b src/paranormal/libcalc/dict.c
--- a/src/paranormal/libcalc/dict.c	Thu Jun 14 23:21:43 2007 -0500
+++ b/src/paranormal/libcalc/dict.c	Sat Jun 16 16:59:53 2007 +0900
@@ -69,7 +69,7 @@
 
     for (i = 0; i < 100; i++) {
       gchar tmpbuf[40];
-      snprintf(tmpbuf, 40, "global_reg%d", i);
+      g_snprintf(tmpbuf, 40, "global_reg%d", i);
       dict_define_variable(&global_dict, tmpbuf);
     }
   }
diff -r 6d03915421e2 -r 6d749f573b3b src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Thu Jun 14 23:21:43 2007 -0500
+++ b/src/wavpack/libwavpack.cxx	Sat Jun 16 16:59:53 2007 +0900
@@ -61,7 +61,7 @@
 InputPlugin mod = {
     NULL,                       //handle
     NULL,                       //filename
-    "WavPack Audio Plugin",
+    (gchar *)"WavPack Audio Plugin",
     wv_load_config,
     wv_about_box,
     wv_configure,