mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-08 00:09:31 +03:00
Merge branch 'dev' into dev-slice
This commit is contained in:
commit
63397d857e
1 changed files with 2 additions and 2 deletions
|
@ -859,8 +859,8 @@ static bool mi_try_new_handler(bool nothrow) {
|
||||||
#else
|
#else
|
||||||
typedef void (*std_new_handler_t)(void);
|
typedef void (*std_new_handler_t)(void);
|
||||||
|
|
||||||
#if (defined(__GNUC__) || defined(__clang__))
|
#if (defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER))) // exclude clang-cl, see issue #631
|
||||||
std_new_handler_t __attribute((weak)) _ZSt15get_new_handlerv(void) {
|
std_new_handler_t __attribute__((weak)) _ZSt15get_new_handlerv(void) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
static std_new_handler_t mi_get_new_handler(void) {
|
static std_new_handler_t mi_get_new_handler(void) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue