diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-12-26 18:01:04 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-01-04 13:59:25 +0000 |
| commit | 14d608cc0bd83ce5d5bdf469ec0e83a6afd97afd (patch) | |
| tree | f394e3d6cde3321d94ad7f2ae457a3e2fa6ec396 | |
| parent | 94c6ec840575a11c485ebb3a652a4bc89917dcd0 (diff) | |
| download | dbus-glib-14d608cc0bd83ce5d5bdf469ec0e83a6afd97afd.tar.gz | |
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.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93513
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | dbus/dbus-binding-tool-glib.c | 6 |
1 files 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"); |