Attachment 120702 Details for Bug 93513 – [PATCH] Stop using G_HAVE_INLINE

[patch] [PATCH] Stop using G_HAVE_INLINE

0001-Stop-using-G_HAVE_INLINE.patch (text/plain), 1.98 KB, created by Colin Watson on 2015-12-26 23:43:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2015-12-26 23:43:15 UTC

Size: 1.98 KB

patch

obsolete

>From 35284f5e05c4f733029ab2c1b301410c001ea72e Mon Sep 17 00:00:00 2001
>From: Colin Watson <cjwatson@debian.org>
>Date: Sat, 26 Dec 2015 18:01:04 +0000
>Subject: [PATCH] Stop using G_HAVE_INLINE
>
>GLib removed this macro from its headers in
>db2367e8782d7a39fc3e93d13f6a16f10cad04c2 (GLib 2.47.2).  It's
>unnecessary here for the same reasons, and relying on it now causes an
>unused-function warning from GCC.
>---
> dbus/dbus-binding-tool-glib.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
>index ff0bb47..f0b6bf6 100644
>--- a/dbus/dbus-binding-tool-glib.c
>+++ b/dbus/dbus-binding-tool-glib.c
>@@ -1491,7 +1491,7 @@ write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, Method
>   
> 
>   /* Write the main wrapper function */
>-  WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\nDBusGProxyCall*\n");
>+  WRITE_OR_LOSE ("static inline DBusGProxyCall*\n");
>   if (!write_printf_to_iochannel ("%s_async (DBusGProxy *proxy", channel, error,
>                                   method_name))
>     goto io_lose;
>@@ -1600,7 +1600,7 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error
>             }
> 
> 
>-          WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\ngboolean\n");
>+          WRITE_OR_LOSE ("static inline gboolean\n");
>           if (!write_printf_to_iochannel ("%s (DBusGProxy *proxy", channel, error,
>                   method_c_name))
>             goto io_lose;
>@@ -1685,7 +1685,7 @@ dbus_binding_tool_output_glib_client (BaseInfo *info, GIOChannel *channel, gbool
> 
>   WRITE_OR_LOSE ("#ifndef _DBUS_GLIB_ASYNC_DATA_FREE\n");
>   WRITE_OR_LOSE ("#define _DBUS_GLIB_ASYNC_DATA_FREE\n");
>-  WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\nvoid\n");
>+  WRITE_OR_LOSE ("static inline void\n");
>   WRITE_OR_LOSE ("_dbus_glib_async_data_free (gpointer stuff)\n{\n\tg_slice_free (DBusGAsyncData, stuff);\n}\n");
>   WRITE_OR_LOSE ("#endif\n\n");
> 
>-- 
>2.6.4
>

Actions: View | Splinter Review

Attachments on bug 93513: 120702

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.