# HG changeset patch # User Kim Alvefur # Date 1573919551 -3600 # Node ID db2a06b9ff98691fea0798bb6da2913aa565b83a # Parent 659b577f280cdf962ce5d93f38012a22ae332189# Parent abfc05495d8b0b76973ec07f4ad82153a8eeb386 Merge 0.11->trunk diff -r abfc05495d8b -r db2a06b9ff98 net/http/files.lua diff -r abfc05495d8b -r db2a06b9ff98 util-src/pposix.c --- a/util-src/pposix.c Sat Nov 16 16:39:45 2019 +0100 +++ b/util-src/pposix.c Sat Nov 16 16:52:31 2019 +0100 @@ -725,20 +725,20 @@ struct mallinfo info = mallinfo(); lua_createtable(L, 0, 5); /* This is the total size of memory allocated with sbrk by malloc, in bytes. */ - lua_pushinteger(L, info.arena); + lua_pushinteger(L, (unsigned)info.arena); lua_setfield(L, -2, "allocated"); /* This is the total size of memory allocated with mmap, in bytes. */ - lua_pushinteger(L, info.hblkhd); + lua_pushinteger(L, (unsigned)info.hblkhd); lua_setfield(L, -2, "allocated_mmap"); /* This is the total size of memory occupied by chunks handed out by malloc. */ - lua_pushinteger(L, info.uordblks); + lua_pushinteger(L, (unsigned)info.uordblks); lua_setfield(L, -2, "used"); /* This is the total size of memory occupied by free (not in use) chunks. */ - lua_pushinteger(L, info.fordblks); + lua_pushinteger(L, (unsigned)info.fordblks); lua_setfield(L, -2, "unused"); /* This is the size of the top-most releasable chunk that normally borders the end of the heap (i.e., the high end of the virtual address space's data segment). */ - lua_pushinteger(L, info.keepcost); + lua_pushinteger(L, (unsigned)info.keepcost); lua_setfield(L, -2, "returnable"); return 1; }