LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 12.0

Browse Source
This commit is contained in:
Alex Szpakowski
2020-01-30 20:03:24 -04:00
parent 9ebb6a5c44 5a27742c34
commit 7684920f19
25 changed files with 4325 additions and 2182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/memory.cpp
+11 -2
View File
@@ -24,7 +24,9 @@
#include <stdlib.h>
#ifdef LOVE_WINDOWS
#define WIN32_LEAN_AND_MEAN
#include <malloc.h>
#include <Windows.h>
#else
#include <unistd.h> // Assume POSIX support.
#endif
@@ -54,8 +56,15 @@ void alignedFree(void *mem)
size_t getPageSize()
{
#ifdef LOVE_WINDOWS
// TODO: Do an actual query.
return 4096;
static DWORD size = 0;
if (size == 0)
{
SYSTEM_INFO si;
GetSystemInfo(&si);
size = si.dwPageSize;
}
return (size_t) size;
#else
static const long size = sysconf(_SC_PAGESIZE);
return size > 0 ? (size_t) size : 4096;