luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1755-revert-gstrfunc' into 'master'

Browse Source 
Revert "macros: Try to use the standard __func__ first in G_STRFUNC"

Closes #1755

See merge request GNOME/glib!799
This commit is contained in:
Sebastian Dröge 2019-05-02 12:24:15 +00:00
commit 0095056008
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gmacros.h
View File

@ -733,10 +733,10 @@
#endif #endif
/* Provide a string identifying the current function, non-concatenatable */ /* Provide a string identifying the current function, non-concatenatable */
#if defined (__func__) #if defined (__GNUC__) && defined (__cplusplus)
#define G_STRFUNC ((const char*) (__func__))
#elif defined (__GNUC__) && defined (__cplusplus)
#define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) #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)) #elif defined (__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1300))
#define G_STRFUNC ((const char*) (__FUNCTION__)) #define G_STRFUNC ((const char*) (__FUNCTION__))
#else #else