Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2018-09-08 11:42:22 +02:00
commit e837abbf5d

View file

@ -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;