luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'allomix302-master-patch-38827' into 'master'

Browse Source 
gmacros: Add __ to noinline to prevent conflict with macro in pixman

Closes #2388

See merge request GNOME/glib!2059
This commit is contained in:
Philip Withnall 2021-05-03 09:37:00 +00:00
commit 95d406cc14
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/glib/glib-sections.txt
View File

@ -767,7 +767,7 @@ g_macro__has_attribute___sentinel__
g_macro__has_attribute___unused__ g_macro__has_attribute___unused__
g_macro__has_attribute_fallthrough g_macro__has_attribute_fallthrough
g_macro__has_attribute_may_alias g_macro__has_attribute_may_alias
g_macro__has_attribute_noinline g_macro__has_attribute___noinline__
g_macro__has_attribute_warn_unused_result g_macro__has_attribute_warn_unused_result
</SECTION> </SECTION>

6
glib/gmacros.h
View File

@ -129,7 +129,7 @@
#define g_macro__has_attribute___pure__ G_GNUC_CHECK_VERSION (2, 96) #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___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___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___alloc_size__ G_GNUC_CHECK_VERSION (4, 3)
#define g_macro__has_attribute___format__ G_GNUC_CHECK_VERSION (2, 4) #define g_macro__has_attribute___format__ G_GNUC_CHECK_VERSION (2, 4)
@ -245,8 +245,8 @@
#define G_GNUC_MALLOC #define G_GNUC_MALLOC
#endif #endif
#if g_macro__has_attribute(noinline) #if g_macro__has_attribute(__noinline__)
#define G_GNUC_NO_INLINE __attribute__ ((noinline)) #define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
#else #else
#define G_GNUC_NO_INLINE #define G_GNUC_NO_INLINE
#endif #endif