diff options
| author | daan <daanl@outlook.com> | 2020-04-06 10:56:53 -0700 |
|---|---|---|
| committer | daan <daanl@outlook.com> | 2020-04-06 10:56:53 -0700 |
| commit | 0a3e5bb69980f29373337e564a80d77de1b80af0 (patch) | |
| tree | 7a9e5ce236deb0c7a8e1f96c1a5acfa16a2f27c7 /include/mimalloc.h | |
| parent | 0f3bd05fd5a9471ddb9f7fe42b40a561b7e3650b (diff) | |
further fixes to compile on mingw without warnings (issue #217)
Diffstat (limited to 'include/mimalloc.h')
| -rw-r--r-- | include/mimalloc.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/mimalloc.h b/include/mimalloc.h index e6f68b6..b99b668 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -42,13 +42,18 @@ terms of the MIT license. A copy of the license can be found in the file #else #define mi_decl_export __declspec(dllimport) #endif - #if (_MSC_VER >= 1900) && !defined(__EDG__) - #define mi_decl_restrict __declspec(allocator) __declspec(restrict) + #if defined(__MINGW32__) + #define mi_decl_restrict + #define mi_attr_malloc __attribute__((malloc)) #else - #define mi_decl_restrict __declspec(restrict) + #if (_MSC_VER >= 1900) && !defined(__EDG__) + #define mi_decl_restrict __declspec(allocator) __declspec(restrict) + #else + #define mi_decl_restrict __declspec(restrict) + #endif + #define mi_attr_malloc #endif #define mi_cdecl __cdecl - #define mi_attr_malloc #define mi_attr_alloc_size(s) #define mi_attr_alloc_size2(s1,s2) #define mi_attr_alloc_align(p) |