From d92bf062217525cfde52aca020f92b5e040dc350 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 7 Mar 2017 21:48:05 +0100 Subject: configure: Fix Lua suffix in FreeBSD preset --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 1abd0a8d..dbbd016c 100755 --- a/configure +++ b/configure @@ -194,7 +194,7 @@ do LUA_INCDIR_SET=yes CFLAGS="-Wall -fPIC -I/usr/local/include" LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" - LUA_SUFFIX="-5.1" + LUA_SUFFIX="51" LUA_SUFFIX_SET=yes LUA_DIR=/usr/local LUA_DIR_SET=yes -- cgit v1.2.3 From 8a9a5fe783823c920b865fa55153ec427b490f5d 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(-) 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 014ceb2aa3d35b3b90e3d95d9a9256af09456503 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(-) 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