From: Arun Raghavan <arun@asymptotic.io>
Date: Thu, 23 Jul 2020 23:36:06 +0000 (-0400)
Subject: proplist-util: Drop deprecated G_CONST_RETURN macro
X-Git-Tag: accepted/tizen/unified/20200908.130450~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F243510%2F1;p=platform%2Fupstream%2Fpulseaudio.git

proplist-util: Drop deprecated G_CONST_RETURN macro

The preference in glib is now to just use the const qualifier directly.

[jcsing.lee: cherry-pick from mainstream commit merge_requests/333]
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>

Change-Id: I255533b36d818a20f193b80864c338ece0e24dd0
---

diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index ccc6699..180c08d 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -45,14 +45,14 @@ extern char **environ;
 
 #if defined(HAVE_GLIB) && defined(PA_GCC_WEAKREF)
 #include <glib.h>
-static G_CONST_RETURN gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_application_name);
+static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_application_name);
 #endif
 
 #if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF)
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-static G_CONST_RETURN gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
+static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
 static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
 #endif