Merge branch 'dev' into dev-slice

16 files changed, 41 insertions, 41 deletions

diff --git a/src/alloc-aligned.c b/src/alloc-aligned.c
index c8a5287..724c0a1 100644
--- a/src/alloc-aligned.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 #include <string.h>  // memset
 
diff --git a/src/alloc-override-osx.c b/src/alloc-override-osx.c
index 89c8674..3a46ecd 100644
--- a/src/alloc-override-osx.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 #if defined(MI_MALLOC_OVERRIDE)
 
diff --git a/src/alloc-posix.c b/src/alloc-posix.c
index 6567c61..43931e5 100644
--- a/src/alloc-posix.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 // ------------------------------------------------------
 // Posix & Unix functions definitions
diff --git a/src/alloc.c b/src/alloc.c
index 6183643..e3052f4 100644
--- a/src/alloc.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // memset, strlen
 #include <stdlib.h>  // malloc, exit
diff --git a/src/arena.c b/src/arena.c
index e06644d..3f93c59 100644
--- a/src/arena.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // memset
 #include <errno.h> // ENOMEM
diff --git a/src/bitmap.c b/src/bitmap.c
index 500b907..50fd474 100644
--- a/src/bitmap.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 #include "bitmap.h"
 
 /* -----------------------------------------------------------
diff --git a/src/heap.c b/src/heap.c
index 4f68000..cba0fd0 100644
--- a/src/heap.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // memset, memcpy
 
diff --git a/src/init.c b/src/init.c
index bcde450..76c2084 100644
--- a/src/init.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 #include <string.h>  // memcpy, memset
 #include <stdlib.h>  // atexit
diff --git a/src/options.c b/src/options.c
index bf2b102..055f844 100644
--- a/src/options.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <stdio.h>
 #include <stdlib.h> // strtol
diff --git a/src/os.c b/src/os.c
index ba8db49..42ed342 100644
--- a/src/os.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // strerror
 
diff --git a/src/page.c b/src/page.c
index c9d43c9..b732c07 100644
--- a/src/page.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 /* -----------------------------------------------------------
   Definition of page queues for each block size
diff --git a/src/random.c b/src/random.c
index 88d2c89..255bede 100644
--- a/src/random.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 #include <string.h> // memset
 
diff --git a/src/region.c b/src/region.c
index 53bf5df..7954073 100644
--- a/src/region.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // memset
 
diff --git a/src/segment.c b/src/segment.c
index a26fb1b..76ce2e0 100644
--- a/src/segment.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <string.h>  // memset
 #include <stdio.h>
diff --git a/src/static.c b/src/static.c
index 19d2c54..5b34ddb 100644
--- a/src/static.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
 
 // For a static override we create a single object file
 // containing the whole library. If it is linked first
diff --git a/src/stats.c b/src/stats.c
index 31c156f..ecf07e4 100644
--- a/src/stats.c
+++ b/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 "../include/mimalloc.h"
-#include "../include/mimalloc-internal.h"
-#include "../include/mimalloc-atomic.h"
+#include "mimalloc.h"
+#include "mimalloc-internal.h"
+#include "mimalloc-atomic.h"
 
 #include <stdio.h>  // fputs, stderr
 #include <string.h> // memset