Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

[ardour.git] / libs / evoral / src / libsmf / smf.c

diff --git a/libs/evoral/src/libsmf/smf.c b/libs/evoral/src/libsmf/smf.c
index ba805e0b041e563d902f9082fe6dbeb80550b5da..3fde1d831e7b021191360ff70908677a3b753e20 100644 (file)
--- a/libs/evoral/src/libsmf/smf.c
+++ b/libs/evoral/src/libsmf/smf.c
@@ -155,7 +155,9 @@ smf_track_delete(smf_track_t *track)
 void
 smf_add_track(smf_t *smf, smf_track_t *track)
 {
+#ifndef NDEBUG
        int cantfail;
+#endif
 
        assert(track->smf == NULL);
 
@@ -166,8 +168,13 @@ smf_add_track(smf_t *smf, smf_track_t *track)
        track->track_number = smf->number_of_tracks;
 
        if (smf->number_of_tracks > 1) {
+#ifndef NDEBUG
                cantfail = smf_set_format(smf, 1);
                assert(!cantfail);
+#else
+               smf_set_format(smf, 1);
+#endif
+               
        }
 }
 
@@ -864,9 +871,8 @@ smf_get_next_event(smf_t *smf)
 void
 smf_skip_next_event(smf_t *smf)
 {
-       void *notused;
-
-       notused = smf_get_next_event(smf);
+       smf_event_t *ignored = smf_get_next_event(smf);
+       (void) ignored;
 }
 
 /**