luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 11:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9f75cc9edf1d311ef4bacc3d686c7afa0c4dcbb2.

It breaks usage of G_STRFUNC when compiling applications with
`-Wpedantic` — `__func__` is not `#define`d, so G_STRFUNC was falling
through to using `__FUNCTION__`, which raises a warning with
`-Wpedantic`.

Fun times.

Fixes: #1755
This commit is contained in:
Philip Withnall 2019-04-26 13:08:21 +01:00
parent dbd8193a87
commit 7f7f7e3cc3
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

@ -304,10 +304,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