mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 21:27:38 +03:00
Merge 0.10->trunk
This commit is contained in:
commit
e837abbf5d
1 changed files with 1 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue