Index: libmpc/branches/r2d/libwavformat/Makefile.am
===================================================================
--- libmpc/branches/r2d/libwavformat/Makefile.am	(revision 137)
+++ libmpc/branches/r2d/libwavformat/Makefile.am	(revision 137)
@@ -0,0 +1,4 @@
+INCLUDES = 
+METASOURCES = AUTO
+lib_LIBRARIES = libwavformat.a
+libwavformat_a_SOURCES = input.c output.c
Index: libmpc/branches/r2d/libwavformat/libwaveformat.h
===================================================================
--- libmpc/branches/r2d/libwavformat/libwaveformat.h	(revision 131)
+++ libmpc/branches/r2d/libwavformat/libwaveformat.h	(revision 137)
@@ -53,5 +53,5 @@
 } t_wav_input_handler;
 
-typedef struct 
+typedef struct
 {
 	t_wav_input_file_callback m_callback;
@@ -71,5 +71,5 @@
 	t_wav_uint32 m_data_position;
 
-	
+
 
 	t_wav_uint8 m_workbuffer[512];
@@ -131,2 +131,3 @@
 
 #endif //__LIBWAVEFORMAT_H__
+
Index: libmpc/branches/r2d/libwavformat/output.c
===================================================================
--- libmpc/branches/r2d/libwavformat/output.c	(revision 131)
+++ libmpc/branches/r2d/libwavformat/output.c	(revision 137)
@@ -140,8 +140,8 @@
 } t_riff_header;
 
-static const t_riff_header g_header_riff = {'R','I','F','F'};
-static const t_riff_header g_header_wave = {'W','A','V','E'};
-static const t_riff_header g_header_data = {'d','a','t','a'};
-static const t_riff_header g_header_fmt  = {'f','m','t',' '};
+static const t_riff_header g_header_riff = {{'R','I','F','F'}};
+static const t_riff_header g_header_wave = {{'W','A','V','E'}};
+static const t_riff_header g_header_data = {{'d','a','t','a'}};
+static const t_riff_header g_header_fmt  = {{'f','m','t',' '}};
 
 static t_wav_uint32 waveformat_write(t_wav_output_file * p_file,void const * p_buffer,t_wav_uint32 p_buffer_size)
@@ -277,5 +277,5 @@
 
 		delta_written = waveformat_write(p_file,p_file->m_workbuffer,delta * p_file->m_bytes_per_sample) / p_file->m_bytes_per_sample;
-		
+
 		if (delta_written > 0)
 		{
@@ -305,5 +305,5 @@
 
 		delta_written = waveformat_write(p_file,p_file->m_workbuffer,delta * p_file->m_bytes_per_sample) / p_file->m_bytes_per_sample;
-		
+
 		if (delta_written > 0)
 		{