prosody
d5c771097ea7
util-src/pposix.c

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

util-src/pposix.c @ 9279:d5c771097ea7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Sep 2018 11:42:22 +0200
parent 9277:fa6a6f921405
parent 9278:8f9e18d4fe50
child 9281:927adf8648d3
line wrap: on
line diff
--- 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;