From 514c2d81975457c26267374886ce0c798b8553e2 Mon Sep 17 00:00:00 2001 From: Robin Verdenal-Tallieux Date: Mon, 3 May 2021 09:37:00 +0000 Subject: [PATCH] gmacros: Add __ to noinline to prevent conflict with macro in pixman Fixes: #2388 --- docs/reference/glib/glib-sections.txt | 2 +- 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 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