# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1536399742 -7200
# Node ID d5c771097ea7dd788e2ad4d71252fe9e407b151d
# Parent  fa6a6f921405b1515b46a3e536648f2902859e7d# Parent  8f9e18d4fe500cc5b167c8c8804156c8466dfe97
Merge 0.10->trunk

diff -r fa6a6f921405 -r d5c771097ea7 util-src/pposix.c
--- a/util-src/pposix.c	Fri Sep 07 15:50:12 2018 +0200
+++ b/util-src/pposix.c	Sat Sep 08 11:42:22 2018 +0200
@@ -520,7 +520,7 @@
 		return RLIMIT_STACK;
 	}
 
-#if !(defined(sun) || defined(__sun))
+#if !(defined(sun) || defined(__sun) || defined(__APPLE__))
 
 	if(!strcmp(s, "MEMLOCK")) {
 		return RLIMIT_MEMLOCK;