MSVC: remove compiler __func__ define

No longer needed and exposes a bug in clang-format see: D4185

diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 390122289b1d4c9fc2f906590972fd30382aed5c..79d0d874d52a99cd3f99a40879ee86be5e218dba 100644 (file)
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -90,11 +90,6 @@ 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)
@@ -203,10 +198,6 @@ 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

diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
index 754a79f08b5ed393d792c1c80fd76dd11fc5f709..79c0271aff0f173e5ffee6090a879ee317d202c2 100644 (file)
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -39,10 +39,6 @@
 #  include <sys/mman.h>
 #endif
 
-#if defined(_MSC_VER)
-#  define __func__ __FUNCTION__
-#endif
-
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else

diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h
index 2b53975a106cfc9c21d16b792ba0866686854344..3a38cdcb5fdce788f35843382ef85690a8010266 100644 (file)
--- a/source/blender/blenlib/BLI_compiler_compat.h
+++ b/source/blender/blenlib/BLI_compiler_compat.h
@@ -28,7 +28,6 @@
  */
 
 #if defined(_MSC_VER)
-#  define __func__ __FUNCTION__
 #  define alloca _alloca
 #endif
 

diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c
index e5f82ae09c8c65beaa498eb34069b02e30272b56..86bca95891db1e7d82987bbf2d827b27a5ea21eb 100644 (file)
--- a/source/blender/datatoc/datatoc_icon.c
+++ b/source/blender/datatoc/datatoc_icon.c
@@ -50,10 +50,6 @@
 #  define SEP '/'
 #endif
 
-#if defined(_MSC_VER)
-#  define __func__ __FUNCTION__
-#endif
-
 /* -------------------------------------------------------------------- */
 /* Utility functions */