aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-07 22:44:12 +0100
committerKim Alvefur <zash@zash.se>2017-03-07 22:44:12 +0100
commitb0eec64a3f56ee4020f2d328e6d51a07f45cab53 (patch)
treeaecd89ed33910dfc20d71cdcdece8d1c72673efa /util-src
parent6403594a10e820f81e9bdffed95d947b7350cca9 (diff)
parent255423ab565b6c7f8653159ac6852deac16d2a48 (diff)
downloadprosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.tar.gz
prosody-b0eec64a3f56ee4020f2d328e6d51a07f45cab53.zip
Merge 0.10->trunk
Diffstat (limited to 'util-src')
-rw-r--r--util-src/pposix.c4
1 files changed, 2 insertions, 2 deletions
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: