# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1488923052 -3600
# Node ID 95e16696ef8a7abe1a85e87e9fcae46ee6d178b1
# Parent  4f9535b7fdf7212072ab0b41bc9755f506bdfecd# Parent  30309fd01d76a4778d6bafe35d58e0e92a38e5a6
Merge 0.10->trunk

diff -r 4f9535b7fdf7 -r 95e16696ef8a configure
--- 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
diff -r 4f9535b7fdf7 -r 95e16696ef8a util-src/pposix.c
--- 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: