Merge branch 'dev' into dev-slice

src/alloc-aligned.c

@@ -5,8 +5,8 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 #include <string.h>  // memset
 

src/alloc-override-osx.c

@@ -5,8 +5,8 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 #if defined(MI_MALLOC_OVERRIDE)
 

src/alloc-posix.c

@@ -9,8 +9,8 @@ terms of the MIT license. A copy of the license can be found in the file
 // mi prefixed publi definitions of various Posix, Unix, and C++ functions
 // for convenience and used when overriding these functions.
 // ------------------------------------------------------------------------
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 // ------------------------------------------------------
 // Posix & Unix functions definitions

src/alloc.c

@@ -4,9 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // memset, strlen
 #include <stdlib.h>  // malloc, exit

src/arena.c

@@ -20,9 +20,9 @@ which is sometimes needed for embedded devices or shared memory for example.
 
 The arena allocation needs to be thread safe and we use an atomic bitmap to allocate.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // memset
 #include <errno.h> // ENOMEM

src/bitmap.c

@@ -17,8 +17,8 @@ The `_across` postfixed functions do allow sequences that can cross over
 between the fields. (This is used in arena allocation)
 ---------------------------------------------------------------------------- */
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 #include "bitmap.h"
 
 /* -----------------------------------------------------------

src/heap.c

@@ -5,9 +5,9 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // memset, memcpy
 

src/init.c

@@ -4,8 +4,8 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 #include <string.h>  // memcpy, memset
 #include <stdlib.h>  // atexit

src/options.c

@@ -4,9 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <stdio.h>
 #include <stdlib.h> // strtol

src/os.c

@@ -16,9 +16,9 @@ terms of the MIT license. A copy of the license can be found in the file
 #undef _XOPEN_SOURCE
 #undef _POSIX_C_SOURCE
 #endif
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // strerror
 

src/page.c

@@ -11,9 +11,9 @@ terms of the MIT license. A copy of the license can be found in the file
   exported is `mi_malloc_generic`.
 ----------------------------------------------------------- */
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 /* -----------------------------------------------------------
   Definition of page queues for each block size

src/random.c

@@ -4,8 +4,8 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 #include <string.h> // memset
 

src/region.c

@@ -31,9 +31,9 @@ Possible issues:
   linearly. At what point will direct OS calls be faster? Is there a way to
   do this better without adding too much complexity?
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // memset
 

src/segment.c

@@ -4,9 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <string.h>  // memset
 #include <stdio.h>

src/static.c

@@ -13,8 +13,8 @@ terms of the MIT license. A copy of the license can be found in the file
 #undef _POSIX_C_SOURCE
 #endif
 
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
 
 // For a static override we create a single object file
 // containing the whole library. If it is linked first

src/stats.c

@@ -4,9 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "../include/mimalloc.h"
+#include "../include/mimalloc-internal.h"
+#include "../include/mimalloc-atomic.h"
 
 #include <stdio.h>  // fputs, stderr
 #include <string.h> // memset