From 3c789f1ac723d5e4673405d8cc250a977de17e53 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 7 Mar 2017 22:33:57 +0100 Subject: util.pposix: Limit meminfo to Linux until we can figure out how to get this info on other platforms --- util-src/pposix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util-src') diff --git a/util-src/pposix.c b/util-src/pposix.c index f9c07e54..78c02365 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -52,7 +52,7 @@ #include #endif -#if !defined(WITHOUT_MALLINFO) +#if !defined(WITHOUT_MALLINFO) && defined(__linux__) #include #define WITH_MALLINFO #endif -- cgit v1.2.3 From 255423ab565b6c7f8653159ac6852deac16d2a48 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 7 Mar 2017 22:36:43 +0100 Subject: util.pposix: Use correct type for limits [-Wconstant-conversion] --- util-src/pposix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util-src') diff --git a/util-src/pposix.c b/util-src/pposix.c index 78c02365..c0cced5c 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -542,7 +542,7 @@ int string2resource(const char *s) { return -1; } -unsigned long int arg_to_rlimit(lua_State *L, int idx, rlim_t current) { +rlim_t arg_to_rlimit(lua_State *L, int idx, rlim_t current) { switch(lua_type(L, idx)) { case LUA_TSTRING: -- cgit v1.2.3