mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-02 17:26:17 +01:00
cleanup: Replace G_GNUC_NO_INLINE with G_NO_INLINE
As per this we can also now mark G_GNUC_NO_INLINE as GLIB_AVAILABLE_MACRO_IN_2_58, given that we don't have anymore headers using it.
This commit is contained in:
parent
15cd0f0461
commit
a6f8fe071e
@ -235,11 +235,6 @@
|
||||
*
|
||||
* Since: 2.58
|
||||
*/
|
||||
/* Note: We can’t annotate this with GLIB_AVAILABLE_MACRO_IN_2_58 because it’s
|
||||
* used within the GLib headers in function declarations which are always
|
||||
* evaluated when a header is included. This results in warnings in third party
|
||||
* code which includes glib.h, even if the third party code doesn’t use the new
|
||||
* macro itself. */
|
||||
|
||||
#if g_macro__has_attribute(__pure__)
|
||||
#define G_GNUC_PURE __attribute__((__pure__))
|
||||
@ -254,9 +249,11 @@
|
||||
#endif
|
||||
|
||||
#if g_macro__has_attribute(__noinline__)
|
||||
#define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
|
||||
#define G_GNUC_NO_INLINE __attribute__ ((__noinline__)) \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_58
|
||||
#else
|
||||
#define G_GNUC_NO_INLINE
|
||||
#define G_GNUC_NO_INLINE \
|
||||
GLIB_AVAILABLE_MACRO_IN_2_58
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
@ -2158,7 +2158,7 @@ type_name##_get_type (void) \
|
||||
return static_g_define_type_id; \
|
||||
} /* closes type_name##_get_type() */ \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
G_NO_INLINE \
|
||||
static GType \
|
||||
type_name##_get_type_once (void) \
|
||||
{ \
|
||||
@ -2327,7 +2327,7 @@ type_name##_get_type (void) \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
G_NO_INLINE \
|
||||
static GType \
|
||||
type_name##_get_type_once (void) \
|
||||
{ \
|
||||
@ -2364,7 +2364,7 @@ type_name##_get_type (void) \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
G_NO_INLINE \
|
||||
static GType \
|
||||
type_name##_get_type_once (void) \
|
||||
{ \
|
||||
@ -2417,7 +2417,7 @@ type_name##_get_type (void) \
|
||||
return static_g_define_type_id; \
|
||||
} \
|
||||
\
|
||||
G_GNUC_NO_INLINE \
|
||||
G_NO_INLINE \
|
||||
static GType \
|
||||
type_name##_get_type_once (void) \
|
||||
{ \
|
||||
|
Loading…
Reference in New Issue
Block a user