kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-10 01:09:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev

Browse source
This commit is contained in:
Daan Leijen 2021-04-06 11:01:06 -07:00
parent c6f5092287
commit 34ba03951e
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mimalloc.h
View file

@ -8,11 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
#ifndef MIMALLOC_H #ifndef MIMALLOC_H
#define MIMALLOC_H #define MIMALLOC_H
<<<<<<< HEAD
#define MI_MALLOC_VERSION 201 // major + 2 digits minor #define MI_MALLOC_VERSION 201 // major + 2 digits minor
=======
#define MI_MALLOC_VERSION 171 // major + 2 digits minor
>>>>>>> dev
// ------------------------------------------------------ // ------------------------------------------------------
// Compiler specific attributes // Compiler specific attributes