Software / code / prosody
Changeset
9279:d5c771097ea7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 08 Sep 2018 11:42:22 +0200 |
| parents | 9277:fa6a6f921405 (current diff) 9278:8f9e18d4fe50 (diff) |
| children | 9281:927adf8648d3 |
| files | util-src/pposix.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
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;
