From: Paul Brossier <piem@altern.org>
Date: Mon, 8 Aug 2005 20:09:49 +0000 (+0000)
Subject: fix gcc-4.0 type warnings
X-Git-Tag: bzr2git~879
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54bf84727272dee8b9618ae9322838a9dd07d909;p=aubio.git

fix gcc-4.0 type warnings
---

diff --git a/ext/midi/midi_file.c b/ext/midi/midi_file.c
index cb1fc37e..fb88c007 100644
--- a/ext/midi/midi_file.c
+++ b/ext/midi/midi_file.c
@@ -150,7 +150,7 @@ int aubio_midi_file_read_mthd(aubio_midi_file_t* mf)
   if (aubio_midi_file_read(mf, mthd, 14) != AUBIO_OK) {
     return AUBIO_FAIL;
   }
-  if ((AUBIO_STRNCMP(mthd, "MThd", 4) != 0) || (mthd[7] != 6) || (mthd[9] > 2)) {
+  if ((AUBIO_STRNCMP((const char*)mthd, "MThd", 4) != 0) || (mthd[7] != 6) || (mthd[9] > 2)) {
     AUBIO_ERR( "Doesn't look like a MIDI file: invalid MThd header");
     return AUBIO_FAIL;
   }
diff --git a/src/resample.c b/src/resample.c
index 1905193a..04edabff 100644
--- a/src/resample.c
+++ b/src/resample.c
@@ -33,8 +33,8 @@ struct _aubio_resampler_t {
 
 aubio_resampler_t * new_aubio_resampler(float ratio, uint_t type) {
 	aubio_resampler_t * s  = AUBIO_NEW(aubio_resampler_t);
-	uint_t error = 0;
-	s->stat = src_new (type, 1, (uint_t*)error) ; /* only one channel */
+	sint_t error = 0;
+	s->stat = src_new (type, 1, (sint_t*)error) ; /* only one channel */
 	s->proc = AUBIO_NEW(SRC_DATA);
 	if (error) AUBIO_ERR("%s\n",src_strerror(error));
 	s->ratio = ratio;