diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 01:22:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 01:33:20 +0300 |
| commit | b1e286bbfe9b8632a93ba40a7a40c77652479b7c (patch) | |
| tree | c3d5a3c0f29cbe70820a3a0850c27a2c6a9385c0 /source | |
| parent | f974a02285c74f669a1714e98de86ba39293bc21 (diff) | |
MSVC: remove compiler __func__ define
No longer needed and exposes a bug in clang-format see: D4185
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/BLI_compiler_compat.h | 1 | ||||
| -rw-r--r-- | source/blender/datatoc/datatoc_icon.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h index 2b53975a106..3a38cdcb5fd 100644 --- 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 e5f82ae09c8..86bca95891d 100644 --- 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 */ |