aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-22 14:22:46 +0000
committerMatthew Wild <mwild1@gmail.com>2013-03-22 14:22:46 +0000
commita2dec278161293bdb918050f2ef7c4f67ecec5b2 (patch)
treeb1bb7539874dc7f64bb74173129613d40fe99e93 /util-src
parent35954e5ddec7de0d46c143ef53f36aec6b254fc2 (diff)
parent541f26b54247c37eed9889910435e35fbf0d9a24 (diff)
downloadprosody-a2dec278161293bdb918050f2ef7c4f67ecec5b2.tar.gz
prosody-a2dec278161293bdb918050f2ef7c4f67ecec5b2.zip
Merge 0.9->trunk
Diffstat (limited to 'util-src')
-rw-r--r--util-src/pposix.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/util-src/pposix.c b/util-src/pposix.c
index 05303d99..99a308cf 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -484,6 +484,9 @@ int string2resource(const char *s) {
if (!strcmp(s, "NPROC")) return RLIMIT_NPROC;
if (!strcmp(s, "RSS")) return RLIMIT_RSS;
#endif
+#ifdef RLIMIT_NICE
+ if (!strcmp(s, "NICE")) return RLIMIT_NICE;
+#endif
return -1;
}