4 files changed, 17 insertions, 16 deletions
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index 5e9cbf1d8..cabde5bba 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -228,6 +228,7 @@ static struct {
 	CurlSockets *sockets;
 } curl;
 
+gcc_const
 static inline GQuark
 curl_quark(void)
 {
@@ -615,7 +616,7 @@ CurlSockets::DispatchSockets()
 
 static bool
 input_curl_init(const config_param &param,
-		G_GNUC_UNUSED GError **error_r)
+		gcc_unused GError **error_r)
 {
 	CURLcode code = curl_global_init(CURL_GLOBAL_ALL);
 	if (code != CURLE_OK) {
@@ -654,7 +655,7 @@ input_curl_init(const config_param &param,
 }
 
 static gpointer
-curl_destroy_sources(G_GNUC_UNUSED gpointer data)
+curl_destroy_sources(gcc_unused gpointer data)
 {
 	delete curl.sockets;
 
@@ -681,7 +682,7 @@ input_curl_finish(void)
  *
  * The caller must lock the mutex.
  */
-G_GNUC_PURE
+gcc_pure
 static size_t
 curl_total_buffer_size(const struct input_curl *c)
 {
@@ -869,7 +870,7 @@ input_curl_close(struct input_stream *is)
 }
 
 static bool
-input_curl_eof(G_GNUC_UNUSED struct input_stream *is)
+input_curl_eof(gcc_unused struct input_stream *is)
 {
 	struct input_curl *c = (struct input_curl *)is;
 
diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx
index 18e896608..501a2a5da 100644
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -95,8 +95,8 @@ refill_buffer(DespotifyInputStream *ctx)
 	}
 }
 
-static void callback(G_GNUC_UNUSED struct despotify_session* ds,
-		int sig, G_GNUC_UNUSED void* data, void* callback_data)
+static void callback(gcc_unused struct despotify_session* ds,
+		     int sig, gcc_unused void* data, void* callback_data)
 {
 	DespotifyInputStream *ctx = (DespotifyInputStream *)callback_data;
 
@@ -124,7 +124,7 @@ static void callback(G_GNUC_UNUSED struct despotify_session* ds,
 static struct input_stream *
 input_despotify_open(const char *url,
 		     Mutex &mutex, Cond &cond,
-		     G_GNUC_UNUSED GError **error_r)
+		     gcc_unused GError **error_r)
 {
 	struct despotify_session *session;
 	struct ds_link *ds_link;
@@ -172,7 +172,7 @@ input_despotify_open(const char *url,
 
 static size_t
 input_despotify_read(struct input_stream *is, void *ptr, size_t size,
-	       G_GNUC_UNUSED GError **error_r)
+		     gcc_unused GError **error_r)
 {
 	DespotifyInputStream *ctx = (DespotifyInputStream *)is;
 	size_t to_cpy = size;
@@ -208,9 +208,9 @@ input_despotify_eof(struct input_stream *is)
 }
 
 static bool
-input_despotify_seek(G_GNUC_UNUSED struct input_stream *is,
-	       G_GNUC_UNUSED goffset offset, G_GNUC_UNUSED int whence,
-	       G_GNUC_UNUSED GError **error_r)
+input_despotify_seek(gcc_unused struct input_stream *is,
+		     gcc_unused goffset offset, gcc_unused int whence,
+		     gcc_unused GError **error_r)
 {
 	return false;
 }
diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index 3dad28730..f27348b27 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -77,7 +77,7 @@ input_ffmpeg_supported(void)
 
 static bool
 input_ffmpeg_init(gcc_unused const config_param &param,
-		  G_GNUC_UNUSED GError **error_r)
+		  gcc_unused GError **error_r)
 {
 	av_register_all();
 
@@ -154,7 +154,7 @@ input_ffmpeg_eof(struct input_stream *is)
 
 static bool
 input_ffmpeg_seek(struct input_stream *is, goffset offset, int whence,
-		  G_GNUC_UNUSED GError **error_r)
+		  gcc_unused GError **error_r)
 {
 	FfmpegInputStream *i = (FfmpegInputStream *)is;
 	int64_t ret = avio_seek(i->h, offset, whence);
diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx
index b347eb92b..678c52f91 100644
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@@ -124,9 +124,9 @@ input_mms_eof(struct input_stream *is)
 }
 
 static bool
-input_mms_seek(G_GNUC_UNUSED struct input_stream *is,
-	       G_GNUC_UNUSED goffset offset, G_GNUC_UNUSED int whence,
-	       G_GNUC_UNUSED GError **error_r)
+input_mms_seek(gcc_unused struct input_stream *is,
+	       gcc_unused goffset offset, gcc_unused int whence,
+	       gcc_unused GError **error_r)
 {
 	return false;
 }