luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-799-func-macro-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !799 “Revert "macros: Try to use the standard __func__ first in G_STRFUNC"” to glib-2-60

See merge request GNOME/glib!899
This commit is contained in:
Sebastian Dröge
2019-06-10 12:15:55 +00:00
parent dbd8193a87 7f7f7e3cc3
commit acdccff4d2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gmacros.h
View File

@@ -304,10 +304,10 @@
#endif
/* Provide a string identifying the current function, non-concatenatable */
#if defined (__func__)
#define G_STRFUNC ((const char*) (__func__))
#elif defined (__GNUC__) && defined (__cplusplus)
#if defined (__GNUC__) && defined (__cplusplus)
#define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__))
#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define G_STRFUNC ((const char*) (__func__))
#elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300))
#define G_STRFUNC ((const char*) (__FUNCTION__))
#else