Software / code / prosody
Changeset
7967:95e16696ef8a
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 07 Mar 2017 22:44:12 +0100 |
| parents | 7963:4f9535b7fdf7 (current diff) 7966:30309fd01d76 (diff) |
| children | 7970:924354a35a02 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Mar 06 16:05:57 2017 +0100 +++ b/configure Tue Mar 07 22:44:12 2017 +0100 @@ -194,7 +194,7 @@ 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
--- a/util-src/pposix.c Mon Mar 06 16:05:57 2017 +0100 +++ b/util-src/pposix.c Tue Mar 07 22:44:12 2017 +0100 @@ -52,7 +52,7 @@ #include <linux/falloc.h> #endif -#if !defined(WITHOUT_MALLINFO) +#if !defined(WITHOUT_MALLINFO) && defined(__linux__) #include <malloc.h> #define WITH_MALLINFO #endif @@ -542,7 +542,7 @@ 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:
