diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-04 22:07:56 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-04 22:07:56 +0100 |
| commit | dcee8888650583abd106f818ee56d5dff9028bba (patch) | |
| tree | 0c37a0f0d2766b5a00a74bc0d3a0a6d5b03a189a /src/daemon/main.c | |
| parent | 3dd8800e6d0ab1f11e981d368ec2bef38c88ce99 (diff) | |
| parent | 656fc6660fac6ad4524fd2b679cbd35c69033d3b (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index b630bd17..0048e7b7 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -6,7 +6,7 @@ PulseAudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. PulseAudio is distributed in the hope that it will be useful, but @@ -294,7 +294,9 @@ static void set_all_rlimits(const pa_daemon_conf *conf) { set_one_rlimit(&conf->rlimit_data, RLIMIT_DATA, "RLIMIT_DATA"); set_one_rlimit(&conf->rlimit_stack, RLIMIT_STACK, "RLIMIT_STACK"); set_one_rlimit(&conf->rlimit_core, RLIMIT_CORE, "RLIMIT_CORE"); +#ifdef RLIMIT_RSS set_one_rlimit(&conf->rlimit_rss, RLIMIT_RSS, "RLIMIT_RSS"); +#endif #ifdef RLIMIT_NPROC set_one_rlimit(&conf->rlimit_nproc, RLIMIT_NPROC, "RLIMIT_NPROC"); #endif |