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/daemon-conf.h | |
| parent | 3dd8800e6d0ab1f11e981d368ec2bef38c88ce99 (diff) | |
| parent | 656fc6660fac6ad4524fd2b679cbd35c69033d3b (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/daemon/daemon-conf.h')
| -rw-r--r-- | src/daemon/daemon-conf.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h index 9331280b..9cec189f 100644 --- a/src/daemon/daemon-conf.h +++ b/src/daemon/daemon-conf.h @@ -9,7 +9,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 @@ -87,8 +87,10 @@ typedef struct pa_daemon_conf { char *config_file; #ifdef HAVE_SYS_RESOURCE_H - pa_rlimit rlimit_fsize, rlimit_data, rlimit_stack, rlimit_core, rlimit_rss; - + pa_rlimit rlimit_fsize, rlimit_data, rlimit_stack, rlimit_core; +#ifdef RLIMIT_RSS + pa_rlimit rlimit_rss; +#endif #ifdef RLIMIT_NOFILE pa_rlimit rlimit_nofile; #endif |