*: use gcc.h macros instead of GLib

9 files changed, 21 insertions, 20 deletions

diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx
index b26a3e1df..d707166c5 100644
--- a/src/output/AlsaOutputPlugin.cxx
+++ b/src/output/AlsaOutputPlugin.cxx
@@ -197,7 +197,7 @@ alsa_finish(struct audio_output *ao)
 }
 
 static bool
-alsa_output_enable(struct audio_output *ao, G_GNUC_UNUSED GError **error_r)
+alsa_output_enable(struct audio_output *ao, gcc_unused GError **error_r)
 {
 	AlsaOutput *ad = (AlsaOutput *)ao;
 
diff --git a/src/output/FifoOutputPlugin.cxx b/src/output/FifoOutputPlugin.cxx
index 50062988c..a3c76aa4d 100644
--- a/src/output/FifoOutputPlugin.cxx
+++ b/src/output/FifoOutputPlugin.cxx
@@ -228,7 +228,7 @@ fifo_output_finish(struct audio_output *ao)
 
 static bool
 fifo_output_open(struct audio_output *ao, AudioFormat &audio_format,
-		 G_GNUC_UNUSED GError **error)
+		 gcc_unused GError **error)
 {
 	FifoOutput *fd = (FifoOutput *)ao;
 
diff --git a/src/output/JackOutputPlugin.cxx b/src/output/JackOutputPlugin.cxx
index 241857d82..bca57cfc1 100644
--- a/src/output/JackOutputPlugin.cxx
+++ b/src/output/JackOutputPlugin.cxx
@@ -615,7 +615,7 @@ mpd_jack_open(struct audio_output *ao, AudioFormat &audio_format,
 }
 
 static void
-mpd_jack_close(G_GNUC_UNUSED struct audio_output *ao)
+mpd_jack_close(gcc_unused struct audio_output *ao)
 {
 	JackOutput *jd = (JackOutput *)ao;
 
diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/OSXOutputPlugin.cxx
index 6e42b2518..09f5581d5 100644
--- a/src/output/OSXOutputPlugin.cxx
+++ b/src/output/OSXOutputPlugin.cxx
@@ -196,10 +196,10 @@ done:
 
 static OSStatus
 osx_render(void *vdata,
-	   G_GNUC_UNUSED AudioUnitRenderActionFlags *io_action_flags,
-	   G_GNUC_UNUSED const AudioTimeStamp *in_timestamp,
-	   G_GNUC_UNUSED UInt32 in_bus_number,
-	   G_GNUC_UNUSED UInt32 in_number_frames,
+	   gcc_unused AudioUnitRenderActionFlags *io_action_flags,
+	   gcc_unused const AudioTimeStamp *in_timestamp,
+	   gcc_unused UInt32 in_bus_number,
+	   gcc_unused UInt32 in_number_frames,
 	   AudioBufferList *buffer_list)
 {
 	OSXOutput *od = (OSXOutput *) vdata;
@@ -390,7 +390,7 @@ osx_output_open(struct audio_output *ao, AudioFormat &audio_format, GError **err
 
 static size_t
 osx_output_play(struct audio_output *ao, const void *chunk, size_t size,
-		G_GNUC_UNUSED GError **error)
+		gcc_unused GError **error)
 {
 	OSXOutput *od = (OSXOutput *)ao;
 
diff --git a/src/output/OpenALOutputPlugin.cxx b/src/output/OpenALOutputPlugin.cxx
index 1864052fa..bf4f58aa7 100644
--- a/src/output/OpenALOutputPlugin.cxx
+++ b/src/output/OpenALOutputPlugin.cxx
@@ -59,6 +59,7 @@ struct OpenALOutput {
 	}
 };
 
+gcc_const
 static inline GQuark
 openal_output_quark(void)
 {
@@ -90,7 +91,7 @@ openal_audio_format(AudioFormat &audio_format)
 	}
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline ALint
 openal_get_source_i(const OpenALOutput *od, ALenum param)
 {
@@ -99,14 +100,14 @@ openal_get_source_i(const OpenALOutput *od, ALenum param)
 	return value;
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline bool
 openal_has_processed(const OpenALOutput *od)
 {
 	return openal_get_source_i(od, AL_BUFFERS_PROCESSED) > 0;
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline ALint
 openal_is_playing(const OpenALOutput *od)
 {
@@ -230,7 +231,7 @@ openal_delay(struct audio_output *ao)
 
 static size_t
 openal_play(struct audio_output *ao, const void *chunk, size_t size,
-	    G_GNUC_UNUSED GError **error)
+	    gcc_unused GError **error)
 {
 	OpenALOutput *od = (OpenALOutput *)ao;
 	ALuint buffer;
diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx
index 2ef0edd67..6362a374f 100644
--- a/src/output/OssOutputPlugin.cxx
+++ b/src/output/OssOutputPlugin.cxx
@@ -231,7 +231,7 @@ oss_output_finish(struct audio_output *ao)
 #ifdef AFMT_S24_PACKED
 
 static bool
-oss_output_enable(struct audio_output *ao, G_GNUC_UNUSED GError **error_r)
+oss_output_enable(struct audio_output *ao, gcc_unused GError **error_r)
 {
 	OssOutput *od = (OssOutput *)ao;
 
diff --git a/src/output/PipeOutputPlugin.cxx b/src/output/PipeOutputPlugin.cxx
index f485f1554..9ff3bb120 100644
--- a/src/output/PipeOutputPlugin.cxx
+++ b/src/output/PipeOutputPlugin.cxx
@@ -95,8 +95,8 @@ pipe_output_finish(struct audio_output *ao)
 
 static bool
 pipe_output_open(struct audio_output *ao,
-		 G_GNUC_UNUSED AudioFormat &audio_format,
-		 G_GNUC_UNUSED GError **error)
+		 gcc_unused AudioFormat &audio_format,
+		 gcc_unused GError **error)
 {
 	PipeOutput *pd = (PipeOutput *)ao;
 
diff --git a/src/output/PulseOutputPlugin.cxx b/src/output/PulseOutputPlugin.cxx
index f59c8d76e..d035d10b7 100644
--- a/src/output/PulseOutputPlugin.cxx
+++ b/src/output/PulseOutputPlugin.cxx
@@ -184,8 +184,8 @@ pulse_wait_for_operation(struct pa_threaded_mainloop *mainloop,
  * the caller thread, to wake pulse_wait_for_operation() up.
  */
 static void
-pulse_output_stream_success_cb(G_GNUC_UNUSED pa_stream *s,
-			       G_GNUC_UNUSED int success, void *userdata)
+pulse_output_stream_success_cb(gcc_unused pa_stream *s,
+			       gcc_unused int success, void *userdata)
 {
 	PulseOutput *po = (PulseOutput *)userdata;
 
@@ -485,7 +485,7 @@ pulse_output_wait_connection(PulseOutput *po, GError **error_r)
 #if PA_CHECK_VERSION(0,9,8)
 
 static void
-pulse_output_stream_suspended_cb(G_GNUC_UNUSED pa_stream *stream, void *userdata)
+pulse_output_stream_suspended_cb(gcc_unused pa_stream *stream, void *userdata)
 {
 	PulseOutput *po = (PulseOutput *)userdata;
 
@@ -531,7 +531,7 @@ pulse_output_stream_state_cb(pa_stream *stream, void *userdata)
 }
 
 static void
-pulse_output_stream_write_cb(G_GNUC_UNUSED pa_stream *stream, size_t nbytes,
+pulse_output_stream_write_cb(gcc_unused pa_stream *stream, size_t nbytes,
 			     void *userdata)
 {
 	PulseOutput *po = (PulseOutput *)userdata;
diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/ShoutOutputPlugin.cxx
index 2d2c0afd0..40f468031 100644
--- a/src/output/ShoutOutputPlugin.cxx
+++ b/src/output/ShoutOutputPlugin.cxx
@@ -391,7 +391,7 @@ my_shout_finish_driver(struct audio_output *ao)
 static void
 my_shout_drop_buffered_audio(struct audio_output *ao)
 {
-	G_GNUC_UNUSED
+	gcc_unused
 	ShoutOutput *sd = (ShoutOutput *)ao;
 
 	/* needs to be implemented for shout */