From a60abf75ac409786045cfc67982821add6a6d3b7 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Thu, 27 Oct 2016 18:42:00 +0200 Subject: build-sys: Use spice-protocol's deprecation macros Signed-off-by: Francois Gouget Acked-by: Jonathon Jongsma --- src/spice-channel.h | 5 +++-- src/spice-util.h | 2 -- src/usb-device-manager.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/spice-channel.h b/src/spice-channel.h index 3b0bffb..aa0d9cb 100644 --- a/src/spice-channel.h +++ b/src/spice-channel.h @@ -24,6 +24,7 @@ #include +#include #include "spice-types.h" #include "spice-glib-enums.h" #include "spice-util.h" @@ -136,9 +137,9 @@ gboolean spice_channel_test_common_capability(SpiceChannel *channel, guint32 cap void spice_channel_flush_async(SpiceChannel *channel, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); gboolean spice_channel_flush_finish(SpiceChannel *channel, GAsyncResult *result, GError **error); #ifndef SPICE_DISABLE_DEPRECATED -SPICE_DEPRECATED +SPICE_GNUC_DEPRECATED void spice_channel_set_capability(SpiceChannel *channel, guint32 cap); -SPICE_DEPRECATED +SPICE_GNUC_DEPRECATED void spice_channel_destroy(SpiceChannel *channel); #endif diff --git a/src/spice-util.h b/src/spice-util.h index a01da0c..a2a7683 100644 --- a/src/spice-util.h +++ b/src/spice-util.h @@ -50,8 +50,6 @@ gchar* spice_uuid_to_string(const guint8 uuid[16]); #endif /* __GNUC__ */ #endif -#define SPICE_DEPRECATED G_GNUC_DEPRECATED - G_END_DECLS #endif /* SPICE_UTIL_H */ diff --git a/src/usb-device-manager.h b/src/usb-device-manager.h index 6a8d0ac..219fe44 100644 --- a/src/usb-device-manager.h +++ b/src/usb-device-manager.h @@ -131,7 +131,7 @@ gboolean spice_usb_device_manager_disconnect_device_finish( SpiceUsbDeviceManager *self, GAsyncResult *res, GError **err); #ifndef SPICE_DISABLE_DEPRECATED -SPICE_DEPRECATED +SPICE_GNUC_DEPRECATED void spice_usb_device_manager_disconnect_device(SpiceUsbDeviceManager *manager, SpiceUsbDevice *device); #endif -- cgit v1.2.3