merge with dev

2019-07-08 15:42:42 -07:00
parent b40fe5178a fc35f6069a
commit 493dfc4b82
22 changed files with 321 additions and 147 deletions
--- a/src/static.c
+++ b/src/static.c
@@ -21,5 +21,6 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "heap.c"
 #include "alloc.c"
 #include "alloc-aligned.c"
+#include "alloc-posix.c"
 #include "init.c"
 #include "options.c"