[glib/glib-2-60: 1/2] Revert "macros: Try to use the standard __func__ first in G_STRFUNC"

[Sebastian Dröge <sdroege src gnome org>]

commit 7f7f7e3cc348a1d3df518db54dcbc0dc12e7d46c
Author: Philip Withnall <withnall endlessm com>
Date:   Fri Apr 26 13:08:21 2019 +0100

    Revert "macros: Try to use the standard __func__ first in G_STRFUNC"
    
    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

 glib/gmacros.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glib/gmacros.h b/glib/gmacros.h
index b0384ccf0..1fe6e760c 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -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