9 files changed, 29 insertions, 24 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index 5f53729a7..960a4836b 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -119,8 +119,8 @@ alsa_configure(AlsaData *ad, ConfigParam *param)
 #endif
 }
 
-static void *alsa_initDriver(mpd_unused struct audio_output *ao,
-			     mpd_unused const struct audio_format *audio_format,
+static void *alsa_initDriver(G_GNUC_UNUSED struct audio_output *ao,
+			     G_GNUC_UNUSED const struct audio_format *audio_format,
 			     ConfigParam * param)
 {
 	/* no need for pthread_once thread-safety when reading config */
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index 4c69592ff..798a188e8 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -75,7 +75,7 @@ static void audioOutputAo_error(const char *msg)
 }
 
 static void *audioOutputAo_initDriver(struct audio_output *ao,
-				      mpd_unused const struct audio_format *audio_format,
+				      G_GNUC_UNUSED const struct audio_format *audio_format,
 				      ConfigParam * param)
 {
 	ao_info *ai;
@@ -176,7 +176,7 @@ static void audioOutputAo_finishDriver(void *data)
 		ao_shutdown();
 }
 
-static void audioOutputAo_dropBufferedAudio(mpd_unused void *data)
+static void audioOutputAo_dropBufferedAudio(G_GNUC_UNUSED void *data)
 {
 	/* not supported by libao */
 }
diff --git a/src/output/fifo_plugin.c b/src/output/fifo_plugin.c
index 201fce92c..b15f5288e 100644
--- a/src/output/fifo_plugin.c
+++ b/src/output/fifo_plugin.c
@@ -20,6 +20,8 @@
 #include "../utils.h"
 #include "../timer.h"
 
+#include <glib.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -155,8 +157,8 @@ static bool openFifo(FifoData *fd)
 	return true;
 }
 
-static void *fifo_initDriver(mpd_unused struct audio_output *ao,
-			     mpd_unused const struct audio_format *audio_format,
+static void *fifo_initDriver(G_GNUC_UNUSED struct audio_output *ao,
+			     G_GNUC_UNUSED const struct audio_format *audio_format,
 			     ConfigParam *param)
 {
 	FifoData *fd;
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index 59b8abf23..d3a718cd1 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -117,7 +117,7 @@ mpd_jack_finish(void *data)
 }
 
 static int
-mpd_jack_srate(mpd_unused jack_nframes_t rate, void *data)
+mpd_jack_srate(G_GNUC_UNUSED jack_nframes_t rate, void *data)
 {
 	struct jack_data *jd = (struct jack_data *)data;
 	struct audio_format *audioFormat = jd->audio_format;
@@ -186,7 +186,7 @@ mpd_jack_error(const char *msg)
 
 static void *
 mpd_jack_init(struct audio_output *ao,
-	      mpd_unused const struct audio_format *audio_format,
+	      G_GNUC_UNUSED const struct audio_format *audio_format,
 	      ConfigParam *param)
 {
 	struct jack_data *jd;
@@ -356,13 +356,13 @@ mpd_jack_open(void *data, struct audio_format *audio_format)
 }
 
 static void
-mpd_jack_close(mpd_unused void *data)
+mpd_jack_close(G_GNUC_UNUSED void *data)
 {
 	/*mpd_jack_finish(audioOutput);*/
 }
 
 static void
-mpd_jack_cancel (mpd_unused void *data)
+mpd_jack_cancel (G_GNUC_UNUSED void *data)
 {
 }
 
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c
index ef822ee74..8972e338b 100644
--- a/src/output/mvp_plugin.c
+++ b/src/output/mvp_plugin.c
@@ -22,6 +22,7 @@
 #include "../output_api.h"
 
 #include <glib.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -103,9 +104,9 @@ static bool mvp_testDefault(void)
 	return false;
 }
 
-static void *mvp_initDriver(mpd_unused struct audio_output *audio_output,
-			    mpd_unused const struct audio_format *audio_format,
-			    mpd_unused ConfigParam *param)
+static void *mvp_initDriver(G_GNUC_UNUSED struct audio_output *audio_output,
+			    G_GNUC_UNUSED const struct audio_format *audio_format,
+			    G_GNUC_UNUSED ConfigParam *param)
 {
 	MvpData *md = g_new(MvpData, 1);
 	md->audio_output = audio_output;
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index 1f582b2b4..1fa887bea 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -23,6 +23,7 @@
 #include "../mixer.h"
 
 #include <glib.h>
+
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
@@ -386,8 +387,8 @@ static void *oss_open_default(ConfigParam *param)
 	return NULL; /* some compilers can be dumb... */
 }
 
-static void *oss_initDriver(mpd_unused struct audio_output *audioOutput,
-			    mpd_unused const struct audio_format *audio_format,
+static void *oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
+			    G_GNUC_UNUSED const struct audio_format *audio_format,
 			    ConfigParam * param)
 {
 	if (param) {
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c
index 36beb1980..ad4128d34 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_plugin.c
@@ -81,9 +81,9 @@ static bool osx_testDefault(void)
 }
 
 static void *
-osx_initDriver(mpd_unused struct audio_output *audioOutput,
-	       mpd_unused const struct audio_format *audio_format,
-	       mpd_unused ConfigParam * param)
+osx_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
+	       G_GNUC_UNUSED const struct audio_format *audio_format,
+	       G_GNUC_UNUSED ConfigParam * param)
 {
 	return newOsxData();
 }
@@ -133,9 +133,10 @@ static void osx_closeDevice(void *data)
 
 static OSStatus
 osx_render(void *vdata,
-	   mpd_unused AudioUnitRenderActionFlags * ioActionFlags,
-	   mpd_unused const AudioTimeStamp * inTimeStamp,
-	   mpd_unused UInt32 inBusNumber, mpd_unused UInt32 inNumberFrames,
+	   G_GNUC_UNUSED AudioUnitRenderActionFlags * ioActionFlags,
+	   G_GNUC_UNUSED const AudioTimeStamp * inTimeStamp,
+	   G_GNUC_UNUSED UInt32 inBusNumber,
+	   G_GNUC_UNUSED UInt32 inNumberFrames,
 	   AudioBufferList * bufferList)
 {
 	OsxData *od = (OsxData *) vdata;
diff --git a/src/output/pulse_plugin.c b/src/output/pulse_plugin.c
index 5f9ba7d1b..e1f6f179b 100644
--- a/src/output/pulse_plugin.c
+++ b/src/output/pulse_plugin.c
@@ -54,7 +54,7 @@ static void pulse_free_data(struct pulse_data *pd)
 
 static void *
 pulse_init(struct audio_output *ao,
-	   mpd_unused const struct audio_format *audio_format,
+	   G_GNUC_UNUSED const struct audio_format *audio_format,
 	   ConfigParam *param)
 {
 	BlockParam *server = NULL;
diff --git a/src/output/shout_ogg.c b/src/output/shout_ogg.c
index 3ecfd3008..d5766d0a3 100644
--- a/src/output/shout_ogg.c
+++ b/src/output/shout_ogg.c
@@ -222,8 +222,8 @@ static int shout_ogg_encoder_init_encoder(struct shout_data *sd)
 }
 
 static int shout_ogg_encoder_send_metadata(struct shout_data *sd,
-					   mpd_unused char * song,
-					   mpd_unused size_t size)
+					   G_GNUC_UNUSED char * song,
+					   G_GNUC_UNUSED size_t size)
 {
 	struct ogg_vorbis_data *od = (struct ogg_vorbis_data *)sd->encoder_data;