From 6e0f10dfd8e5ffe01f3f85dc30b562b4c703098a Mon Sep 17 00:00:00 2001 From: daan Date: Wed, 2 Nov 2022 10:25:46 -0700 Subject: [PATCH] potential fix for link error with clang-cl (issue #631) --- src/alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index 10945702..af255f67 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -853,8 +853,8 @@ static bool mi_try_new_handler(bool nothrow) { #else typedef void (*std_new_handler_t)(void); -#if (defined(__GNUC__) || defined(__clang__)) -std_new_handler_t __attribute((weak)) _ZSt15get_new_handlerv(void) { +#if (defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER))) // exclude clang-cl, see issue #631 +std_new_handler_t __attribute__((weak)) _ZSt15get_new_handlerv(void) { return NULL; } static std_new_handler_t mi_get_new_handler(void) {