Merge branch 'dev' into dev-win

This commit is contained in:
daan 2019-08-19 21:23:04 -07:00
commit 05631ebfc4
6 changed files with 33 additions and 14 deletions

View file

@ -22,6 +22,9 @@ terms of the MIT license. A copy of the license can be found in the file
#else
#include <sys/mman.h> // mmap
#include <unistd.h> // sysconf
#if defined(__linux__)
#include <linux/mman.h> // linux mmap flags
#endif
#if defined(__APPLE__)
#include <mach/vm_statistics.h>
#endif