[Bf-blender-cvs] [af11eea3fd0] master: Fix logger build w/ MSVC

[Campbell Barton]

Commit: af11eea3fd047007ea0f63f5ad2efbd1390221f3
Author: Campbell Barton
Date:   Sat Mar 31 09:18:30 2018 +0200
Branches: master
https://developer.blender.org/rBaf11eea3fd047007ea0f63f5ad2efbd1390221f3

Fix logger build w/ MSVC

===================================================================

M	intern/clog/CLG_log.h

===================================================================

diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 2da5a7d367c..691806c77b9 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -37,6 +37,11 @@ extern "C" {
 #  define _CLOG_ATTR_PRINTF_FORMAT(format_param, dots_param)
 #endif
 
+#if defined(_MSC_VER) && !defined(__func__)
+#  define __func__MSVC
+#  define __func__ __FUNCTION__
+#endif
+
 #define STRINGIFY_ARG(x) "" #x
 #define STRINGIFY_APPEND(a, b) "" a #b
 #define STRINGIFY(x) STRINGIFY_APPEND("", x)
@@ -140,6 +145,10 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
 #define CLOG_STR_ERROR_N(clg_ref, ...)       CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_ERROR, 0, __VA_ARGS__)
 #define CLOG_STR_FATAL_N(clg_ref, ...)       CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_FATAL, 0, __VA_ARGS__)
 
+#ifdef __func__MSVC
+#  undef __func__MSVC
+#endif
+
 #ifdef __cplusplus
 }
 #endif