diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-07 22:44:12 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-07 22:44:12 +0100 |
| commit | b0eec64a3f56ee4020f2d328e6d51a07f45cab53 (patch) | |
| tree | aecd89ed33910dfc20d71cdcdece8d1c72673efa | |
| parent | 6403594a10e820f81e9bdffed95d947b7350cca9 (diff) | |
| parent | 255423ab565b6c7f8653159ac6852deac16d2a48 (diff) | |
| download | prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.tar.gz prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.zip | |
Merge 0.10->trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | util-src/pposix.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/util-src/pposix.c b/util-src/pposix.c index f9c07e54..c0cced5c 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -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 @@ 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: |