From 2fc6b14bab0090eb84dd1f7a3f24d1e67918e3ff Mon Sep 17 00:00:00 2001 From: Daan Date: Thu, 6 Mar 2025 21:03:51 -0800 Subject: [PATCH 1/3] bump version to 1.9.3 for further development --- cmake/mimalloc-config-version.cmake | 2 +- include/mimalloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake index 7f3bd631..aeea621f 100644 --- a/cmake/mimalloc-config-version.cmake +++ b/cmake/mimalloc-config-version.cmake @@ -1,6 +1,6 @@ set(mi_version_major 1) set(mi_version_minor 9) -set(mi_version_patch 2) +set(mi_version_patch 3) set(mi_version ${mi_version_major}.${mi_version_minor}) set(PACKAGE_VERSION ${mi_version}) diff --git a/include/mimalloc.h b/include/mimalloc.h index 4e9c3156..8ccfcec3 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file #ifndef MIMALLOC_H #define MIMALLOC_H -#define MI_MALLOC_VERSION 192 // major + 2 digits minor +#define MI_MALLOC_VERSION 193 // major + 2 digits minor // ------------------------------------------------------ // Compiler specific attributes From 4aae566191b9443d53995245b637ce28d617710a Mon Sep 17 00:00:00 2001 From: daanx Date: Mon, 10 Mar 2025 12:17:46 -0700 Subject: [PATCH 2/3] fix link error with msvc in C mode (issue #1030) --- ide/vs2022/mimalloc-lib.vcxproj | 2 +- include/mimalloc/atomic.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ide/vs2022/mimalloc-lib.vcxproj b/ide/vs2022/mimalloc-lib.vcxproj index abdac1d1..95b516ec 100644 --- a/ide/vs2022/mimalloc-lib.vcxproj +++ b/ide/vs2022/mimalloc-lib.vcxproj @@ -308,7 +308,7 @@ false false Default - CompileAsCpp + CompileAsC true stdcpp20 diff --git a/include/mimalloc/atomic.h b/include/mimalloc/atomic.h index 6eaa6f99..2984f50f 100644 --- a/include/mimalloc/atomic.h +++ b/include/mimalloc/atomic.h @@ -266,6 +266,13 @@ static inline int64_t mi_atomic_addi64_relaxed(volatile _Atomic(int64_t)*p, int6 return current; #endif } +static inline void mi_atomic_void_addi64_relaxed(volatile int64_t* p, const volatile int64_t* padd) { + const int64_t add = *padd; + if (add != 0) { + mi_atomic_addi64_relaxed((volatile _Atomic(int64_t)*)p, add); + } +} + static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t x) { int64_t current; do { From f11732acdfe3e33f64f4aa3e7db657ffd80dea8f Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Mon, 10 Mar 2025 12:39:09 -0700 Subject: [PATCH 3/3] set default compilation to c++ mode on msvc --- ide/vs2022/mimalloc-lib.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ide/vs2022/mimalloc-lib.vcxproj b/ide/vs2022/mimalloc-lib.vcxproj index 95b516ec..abdac1d1 100644 --- a/ide/vs2022/mimalloc-lib.vcxproj +++ b/ide/vs2022/mimalloc-lib.vcxproj @@ -308,7 +308,7 @@ false false Default - CompileAsC + CompileAsCpp true stdcpp20