kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building under Solaris.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-02 20:27:28 +00:00
parent f6e3c1250c
commit 0f36e1ef75
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_limit.c
View File

@@ -54,8 +54,10 @@ static struct limits {
{ RLIMIT_CORE, "-c", "core file size" }, { RLIMIT_CORE, "-c", "core file size" },
#ifdef RLIMIT_RSS #ifdef RLIMIT_RSS
{ RLIMIT_RSS, "-m", "resident memory" }, { RLIMIT_RSS, "-m", "resident memory" },
{ RLIMIT_NPROC, "-u", "number of processes" },
{ RLIMIT_MEMLOCK, "-l", "amount of memory locked into RAM" }, { RLIMIT_MEMLOCK, "-l", "amount of memory locked into RAM" },
#endif
#ifdef RLIMIT_NPROC
{ RLIMIT_NPROC, "-u", "number of processes" },
#endif #endif
{ RLIMIT_NOFILE, "-n", "number of file descriptors" }, { RLIMIT_NOFILE, "-n", "number of file descriptors" },
#ifdef VMEM_DEF #ifdef VMEM_DEF
@@ -107,7 +109,11 @@ static int my_ulimit(int fd, int argc, char **argv)
if (argc == 3) { if (argc == 3) {
int x; int x;
#ifdef RLIMIT_NPROC
if (resource != RLIMIT_NOFILE && resource != RLIMIT_CORE && resource != RLIMIT_NPROC && resource != RLIMIT_FSIZE) { if (resource != RLIMIT_NOFILE && resource != RLIMIT_CORE && resource != RLIMIT_NPROC && resource != RLIMIT_FSIZE) {
#else
if (resource != RLIMIT_NOFILE && resource != RLIMIT_CORE && resource != RLIMIT_FSIZE) {
#endif
ast_cli(fd, "Resource not permitted to be set\n"); ast_cli(fd, "Resource not permitted to be set\n");
return RESULT_FAILURE; return RESULT_FAILURE;
} }