Assume RLIMIT_NOFILE is defined

It is required by POSIX.1-2001.

Cc: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/libmisc/limits.c b/libmisc/limits.c
index c6f4fa48424d6875e3e2f721aa6a830c064e01c4..81b56b645825dbb4871a88565cb85f5ae1826944 100644 (file)
--- a/libmisc/limits.c
+++ b/libmisc/limits.c
@@ -282,13 +282,11 @@ static int do_user_limits (const char *buf, const char *name)
                        retval |= setrlimit_value (RLIMIT_MEMLOCK, pp, 1024);
                        break;
 #endif
-#ifdef RLIMIT_NOFILE
                case 'n':
                case 'N':
                        /* RLIMIT_NOFILE - max number of open files */
                        retval |= setrlimit_value (RLIMIT_NOFILE, pp, 1);
                        break;
-#endif
 #ifdef RLIMIT_RTPRIO
                case 'o':
                case 'O':

diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c
index 70453d2df0cc33ddc63318a65e5c0d2f3f5a8eaa..c7cffba346f9566eff4255c4a30b6f9d61726dbf 100644 (file)
--- a/libmisc/pwd_init.c
+++ b/libmisc/pwd_init.c
@@ -37,9 +37,7 @@ void pwd_init (void)
        setrlimit (RLIMIT_CPU, &rlim);
        setrlimit (RLIMIT_DATA, &rlim);
        setrlimit (RLIMIT_FSIZE, &rlim);
-#ifdef RLIMIT_NOFILE
        setrlimit (RLIMIT_NOFILE, &rlim);
-#endif
 #ifdef RLIMIT_RSS
        setrlimit (RLIMIT_RSS, &rlim);
 #endif