diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-10-11 14:34:59 +0800 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-10-11 13:42:59 -0400 |
| commit | 08d6e1147d2e6e3abf85ae7a399c689609a7b761 (patch) | |
| tree | b51f31353dafd010e4447defe0b293a54d2d3ede /gobject | |
| parent | a1acf35653ac5d437bdd8dce1b2b56333b005c0c (diff) | |
Use GLIB_DEPRECATED instead of G_GNUC_DEPRECATED in our headers
This will let others opt out of seeing GLib deprecation warnings
by defining GLIB_DISABLE_DEPRECATION_WARNINGS.
https://bugzilla.gnome.org/show_bug.cgi?id=661438
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/gboxed.h | 3 | ||||
| -rw-r--r-- | gobject/gobject.h | 3 | ||||
| -rw-r--r-- | gobject/gparam.h | 3 | ||||
| -rw-r--r-- | gobject/gvaluetypes.h | 8 |
4 files changed, 11 insertions, 6 deletions
diff --git a/gobject/gboxed.h b/gobject/gboxed.h index 0fff0e816..d89814060 100644 --- a/gobject/gboxed.h +++ b/gobject/gboxed.h @@ -79,8 +79,9 @@ void g_value_set_static_boxed (GValue *value, void g_value_take_boxed (GValue *value, gconstpointer v_boxed); #ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED_FOR(g_value_take_boxed) void g_value_set_boxed_take_ownership (GValue *value, - gconstpointer v_boxed) G_GNUC_DEPRECATED_FOR(g_value_take_boxed); + gconstpointer v_boxed); #endif gpointer g_value_get_boxed (const GValue *value); gpointer g_value_dup_boxed (const GValue *value); diff --git a/gobject/gobject.h b/gobject/gobject.h index fec308993..277001f03 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -527,8 +527,9 @@ void g_object_run_dispose (GObject *object); void g_value_take_object (GValue *value, gpointer v_object); #ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED_FOR(g_value_take_object) void g_value_set_object_take_ownership (GValue *value, - gpointer v_object) G_GNUC_DEPRECATED_FOR(g_value_take_object); + gpointer v_object); #endif #if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION) diff --git a/gobject/gparam.h b/gobject/gparam.h index 2561677e0..cc7352b90 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -313,8 +313,9 @@ GParamSpec* g_value_dup_param (const GValue *value); void g_value_take_param (GValue *value, GParamSpec *param); #ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED_FOR(g_value_take_param) void g_value_set_param_take_ownership (GValue *value, - GParamSpec *param) G_GNUC_DEPRECATED_FOR(g_value_take_param); + GParamSpec *param); #endif /* --- convenience functions --- */ diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h index bb2988207..6ec61d554 100644 --- a/gobject/gvaluetypes.h +++ b/gobject/gvaluetypes.h @@ -178,9 +178,10 @@ G_BEGIN_DECLS /* --- prototypes --- */ #ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED void g_value_set_char (GValue *value, - gchar v_char) G_GNUC_DEPRECATED; -gchar g_value_get_char (const GValue *value) G_GNUC_DEPRECATED; + gchar v_char); +GLIB_DEPRECATED gchar g_value_get_char (const GValue *value); #endif void g_value_set_schar (GValue *value, gint8 v_char); @@ -246,8 +247,9 @@ gchar* g_strdup_value_contents (const GValue *value); void g_value_take_string (GValue *value, gchar *v_string); #ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED_FOR(g_value_take_string) void g_value_set_string_take_ownership (GValue *value, - gchar *v_string) G_GNUC_DEPRECATED_FOR(g_value_take_string); + gchar *v_string); #endif |