diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-05-04 11:18:28 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-05-04 12:13:26 +0200 |
| commit | c999133e539cd01860338bf6d0f33d825ae94490 (patch) | |
| tree | e1d43124942b7ee9c2bb1cee8c368ddfa13d59e6 | |
| parent | 15f1d0c9aad23f5ada64594c127ca015d4d8dbfe (diff) | |
| download | coreutils-c999133e539cd01860338bf6d0f33d825ae94490.tar.xz | |
maint: rely on gnulib's new sys_resource module
* bootstrap.conf (gnulib_modules): Add sys_resource.
* src/sort.c: Remove #if HAVE_SYS_RESOURCE_H guard around inclusion
of <sys/resource.h> and move the inclusion "up" into the alphabetized
list of its peers. This also avoids a failure of the
sc_prohibit_always_true_header_tests syntax-check rule.
* m4/jm-macros.m4 (gl_CHECK_ALL_HEADERS): Remove sys/resource.h.
| -rw-r--r-- | bootstrap.conf | 1 | ||||
| -rw-r--r-- | m4/jm-macros.m4 | 1 | ||||
| -rw-r--r-- | src/sort.c | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 41b9cc224..eab660612 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -226,6 +226,7 @@ gnulib_modules=" strtoumax symlink sys_ioctl + sys_resource sys_stat sys_wait termios diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 94cdf82b6..016172f04 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -189,7 +189,6 @@ AC_DEFUN([gl_CHECK_ALL_HEADERS], priv.h stropts.h sys/param.h - sys/resource.h sys/systeminfo.h syslog.h ]) diff --git a/src/sort.c b/src/sort.c index 60ff415cf..493e7f173 100644 --- a/src/sort.c +++ b/src/sort.c @@ -24,6 +24,7 @@ #include <getopt.h> #include <pthread.h> +#include <sys/resource.h> #include <sys/types.h> #include <sys/wait.h> #include <signal.h> @@ -52,9 +53,6 @@ #include "xnanosleep.h" #include "xstrtol.h" -#if HAVE_SYS_RESOURCE_H -# include <sys/resource.h> -#endif #ifndef RLIMIT_DATA struct rlimit { size_t rlim_cur; }; # define getrlimit(Resource, Rlp) (-1) |