diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2021-05-03 09:37:00 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-05-03 09:37:00 +0000 |
| commit | 95d406cc147e461c14128cf202f65cd5cee42d5c (patch) | |
| tree | 2cf87168a1f367dac0f90ea4a3fb207b81fa28dc | |
| parent | f39d4f1fa762e8ab7bba5fbc08d3db380e8512c6 (diff) | |
| parent | 514c2d81975457c26267374886ce0c798b8553e2 (diff) | |
| download | glib-95d406cc147e461c14128cf202f65cd5cee42d5c.tar.gz | |
Merge branch 'allomix302-master-patch-38827' into 'master'
gmacros: Add __ to noinline to prevent conflict with macro in pixman
Closes #2388
See merge request GNOME/glib!2059
| -rw-r--r-- | docs/reference/glib/glib-sections.txt | 2 | ||||
| -rw-r--r-- | glib/gmacros.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index 482b01b51..46a88af0b 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -767,7 +767,7 @@ g_macro__has_attribute___sentinel__ g_macro__has_attribute___unused__ g_macro__has_attribute_fallthrough g_macro__has_attribute_may_alias -g_macro__has_attribute_noinline +g_macro__has_attribute___noinline__ g_macro__has_attribute_warn_unused_result </SECTION> diff --git a/glib/gmacros.h b/glib/gmacros.h index 286f1307d..ca5682002 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -129,7 +129,7 @@ #define g_macro__has_attribute___pure__ G_GNUC_CHECK_VERSION (2, 96) #define g_macro__has_attribute___malloc__ G_GNUC_CHECK_VERSION (2, 96) -#define g_macro__has_attribute_noinline G_GNUC_CHECK_VERSION (2, 96) +#define g_macro__has_attribute___noinline__ G_GNUC_CHECK_VERSION (2, 96) #define g_macro__has_attribute___sentinel__ G_GNUC_CHECK_VERSION (4, 0) #define g_macro__has_attribute___alloc_size__ G_GNUC_CHECK_VERSION (4, 3) #define g_macro__has_attribute___format__ G_GNUC_CHECK_VERSION (2, 4) @@ -245,8 +245,8 @@ #define G_GNUC_MALLOC #endif -#if g_macro__has_attribute(noinline) -#define G_GNUC_NO_INLINE __attribute__ ((noinline)) +#if g_macro__has_attribute(__noinline__) +#define G_GNUC_NO_INLINE __attribute__ ((__noinline__)) #else #define G_GNUC_NO_INLINE #endif |