[Mesa-dev] [PATCH] glx: replace __FUNCTION__ with __func__

Marius Predut marius.predut at intel.com
Tue Apr 7 12:06:01 PDT 2015


Consistently just use C99's __func__ everywhere.
The patch was verified with Microsoft Visual studio 2013
redistributable package(RTM version number: 18.0.21005.1)
Next MSVC versions intends to support __func__.
No functional changes.

Signed-off-by: Marius Predut <marius.predut at intel.com>
---
 src/glx/apple/apple_glx_log.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glx/apple/apple_glx_log.h b/src/glx/apple/apple_glx_log.h
index 4b1c531..b1a5538 100644
--- a/src/glx/apple/apple_glx_log.h
+++ b/src/glx/apple/apple_glx_log.h
@@ -39,14 +39,14 @@ __printflike(5, 6)
 void _apple_glx_log(int level, const char *file, const char *function,
                     int line, const char *fmt, ...);
 #define apple_glx_log(l, f, args ...) \
-    _apple_glx_log(l, __FILE__, __FUNCTION__, __LINE__, f, ## args)
+    _apple_glx_log(l, __FILE__, __func__, __LINE__, f, ## args)
 
 
 __printflike(5, 0)
 void _apple_glx_vlog(int level, const char *file, const char *function,
                      int line, const char *fmt, va_list v);
 #define apple_glx_vlog(l, f, v) \
-    _apple_glx_vlog(l, __FILE__, __FUNCTION__, __LINE__, f, v)
+    _apple_glx_vlog(l, __FILE__, __func__, __LINE__, f, v)
 
 /* This is just here to help the transition.
  * TODO: Replace calls to apple_glx_diagnostic
-- 
1.7.9.5



More information about the mesa-dev mailing list