--- np2/x11/cmmidi.c	2003/12/25 05:07:49	1.3
+++ np2/x11/cmmidi.c	2011/01/15 16:01:52	1.5
@@ -6,9 +6,9 @@
 #include "mimpidef.h"
 #include "sound.h"
 
-#if defined(VERMOUTH_LIB)
 #include "vermouth.h"
 
+#if defined(VERMOUTH_LIB)
 extern MIDIMOD vermouth_module;
 
 const char cmmidi_vermouth[] = "VERMOUTH";
@@ -68,9 +68,7 @@ enum {
 	CMMIDI_MIDIOUT		= 0x01,
 	CMMIDI_MIDIIN		= 0x02,
 	CMMIDI_MIDIINSTART	= 0x04,
-#if defined(VERMOUTH_LIB)
 	CMMIDI_VERMOUTH		= 0x08,
-#endif
 
 	MIDICTRL_READY		= 0,
 	MIDICTRL_2BYTES,
@@ -97,9 +95,7 @@ struct _cmmidi {
 	int		hmidiin;
 	int		hmidiout;
 	struct timeval	hmidiout_nextstart;
-#if defined(VERMOUTH_LIB)
 	MIDIHDL		vermouth;
-#endif
 
 	UINT		midictrl;
 	UINT		midisyscnt;
@@ -256,9 +252,7 @@ static void
 midiout_none(CMMIDI midi, UINT32 msg, UINT cnt)
 {
 
-	UNUSED(midi);
-	UNUSED(msg);
-	UNUSED(cnt);
+	/* Nothing to do */
 }
 
 static void
@@ -279,8 +273,6 @@ static void
 midiout_vermouth(CMMIDI midi, UINT32 msg, UINT cnt)
 {
 
-	UNUSED(cnt);
-
 	sound_sync();
 	midiout_shortmsg(midi->vermouth, msg);
 }
@@ -593,8 +585,6 @@ static BYTE
 midigetstat(COMMNG self)
 {
 
-	UNUSED(self);
-
 	return 0x00;
 }