2006-12-18 Keishi Suenaga <skeishi@yahoo.co.jp>

	* timidity/midi_a.c  u_int8_t  must be uint8_t.
	* timidity/flac_a.c  fix for mingw.
ChangeLog: update

diff --git a/ChangeLog b/ChangeLog
index 31f65fb..e3641a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
 2006-12-18  Keishi Suenaga <skeishi@yahoo.co.jp>\r
-       * autoconf/ogg.m4 from libogg-1.1.3.tar.gz\r
-       * autoconf/vorbis.m4 from libvorbis-1.1.2.tar.gz
-       * timidity/portaudio_a.c bug fix
+\r
+       * timidity/midi_a.c:  u_int8_t  must be uint8_t.\r
+       * timidity/flac_a.c:  fix for mingw.\r
+\r
+2006-12-18  Keishi Suenaga <skeishi@yahoo.co.jp>\r
+\r
+       * autoconf/ogg.m4: from libogg-1.1.3.tar.gz\r
+       * autoconf/vorbis.m4: from libvorbis-1.1.2.tar.gz
+       * timidity/portaudio_a.c: bug fix
+\r
 2006-12-14  Stas Sergeev <stsp@aknet.ru>
 
        * interface/server_c.c: extend midi protocol.

diff --git a/timidity/flac_a.c b/timidity/flac_a.c
index 32faf9d..1f928f2 100644 (file)
--- a/timidity/flac_a.c
+++ b/timidity/flac_a.c
@@ -41,6 +41,8 @@
 #include <FLAC/export.h> /* need export.h to figure out API version from FLAC_API_VERSION_CURRENT */
 #undef FLAC_API
 #undef OggFLAC_API
+#define FLAC_API
+#define OggFLAC_API
 #endif
 
 /* by LEGACY_FLAC we mean before FLAC 1.1.3 */

diff --git a/timidity/midi_a.c b/timidity/midi_a.c
index 4b3b59e..4ba64cd 100644 (file)
--- a/timidity/midi_a.c
+++ b/timidity/midi_a.c
@@ -100,7 +100,7 @@ PlayMode dmp = {
     acntl
 };
 
-#define CARR(...) ((u_int8_t []) {__VA_ARGS__})
+#define CARR(...) ((uint8_t []) {__VA_ARGS__})
 #define M_FWRITE(...) m_fwrite(CARR(__VA_ARGS__), sizeof(CARR(__VA_ARGS__)))
 #define M_FWRITE_STR(s) m_fwrite((s), sizeof(s) - 1)