From b1e286bbfe9b8632a93ba40a7a40c77652479b7c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Jan 2019 09:22:21 +1100 Subject: MSVC: remove compiler __func__ define No longer needed and exposes a bug in clang-format see: D4185 --- intern/clog/CLG_log.h | 9 --------- intern/guardedalloc/intern/mallocn_intern.h | 4 ---- 2 files changed, 13 deletions(-) (limited to 'intern') diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h index 390122289b1..79d0d874d52 100644 --- 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 754a79f08b5..79c0271aff0 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -39,10 +39,6 @@ # include #endif -#if defined(_MSC_VER) -# define __func__ __FUNCTION__ -#endif - #ifdef __GNUC__ # define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) #else -- cgit v1.2.3