Fix building under Solaris.
authorJoshua Colp <jcolp@digium.com>
Mon, 2 Jul 2007 20:27:28 +0000 (20:27 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 2 Jul 2007 20:27:28 +0000 (20:27 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72935 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_limit.c

index 045f8db..d8fe851 100644 (file)
@@ -54,9 +54,11 @@ static struct limits {
        { RLIMIT_CORE, "-c", "core file size" },
 #ifdef RLIMIT_RSS
        { RLIMIT_RSS, "-m", "resident memory" },
-       { RLIMIT_NPROC, "-u", "number of processes" },
        { RLIMIT_MEMLOCK, "-l", "amount of memory locked into RAM" },
 #endif
+#ifdef RLIMIT_NPROC
+       { RLIMIT_NPROC, "-u", "number of processes" },
+#endif
        { RLIMIT_NOFILE, "-n", "number of file descriptors" },
 #ifdef VMEM_DEF
        { VMEM_DEF, "-v", "virtual memory" },
@@ -107,7 +109,11 @@ static int my_ulimit(int fd, int argc, char **argv)
 
                if (argc == 3) {
                        int x;
+#ifdef RLIMIT_NPROC
                        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");
                                return RESULT_FAILURE;
                        }