diff options
| author | Kim Alvefur <zash@zash.se> | 2018-09-08 11:42:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-09-08 11:42:22 +0200 |
| commit | 02b648d54f973e311001509960510da02a76e9c9 (patch) | |
| tree | 9908168db100e53afc5d0fba348e40665ea5d386 | |
| parent | 8d7eede4acd38f3620c9d1afa154286a69c367b1 (diff) | |
| parent | 4d3ba7e40775e933a70283cd97c385f4c88038cb (diff) | |
| download | prosody-02b648d54f973e311001509960510da02a76e9c9.tar.gz prosody-02b648d54f973e311001509960510da02a76e9c9.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util-src/pposix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-src/pposix.c b/util-src/pposix.c index e7d91b37..4ce55075 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -520,7 +520,7 @@ int string2resource(const char *s) { return RLIMIT_STACK; } -#if !(defined(sun) || defined(__sun)) +#if !(defined(sun) || defined(__sun) || defined(__APPLE__)) if(!strcmp(s, "MEMLOCK")) { return RLIMIT_MEMLOCK; |