diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2014-05-16 00:04:41 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2014-05-16 00:17:22 +0200 |
| commit | 38736fdf39351c807caffcce75e2f89196889e42 (patch) | |
| tree | 9a8042920170bfb9bf9999f0a3a22b59278aeb6e | |
| parent | 4df7d90b36f4cd2f51dbbdbdd0f73f9c30640c9e (diff) | |
| download | glibc-38736fdf39351c807caffcce75e2f89196889e42.tar.gz glibc-38736fdf39351c807caffcce75e2f89196889e42.tar.xz glibc-38736fdf39351c807caffcce75e2f89196889e42.zip | |
SPARC: add prlimit and prlimit64 in <bits/resource.h> (BZ #16943)
prlimit and prlimit64 have been added in the main <bits/resource.h>, but not in the SPARC specific version. Fix that. Note: this is Debian bug#703559, reported by Emilio Pozuelo Monfort <pochu@debian.org> (cherry picked from commit d16e6ec7ca2c861ba681e3a2fbd431725774292e)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/resource.h | 27 |
3 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4f0c034d46..7e235ac392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-16 Aurelien Jarno <aurelien@aurel32.net> + + [BZ #16943] + * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Declare prlimit + and prlimit64. + 2014-05-06 Aurelien Jarno <aurelien@aurel32.net> [BZ# 16916] diff --git a/NEWS b/NEWS index a182e4c66a..7703b6ee1c 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,7 @@ using `glibc' in the "product" field. Version 2.17.1 * The following bugs are resolved with this release: - 15003, 15006, 15073, 15122, 15759, 16510, 16885, 16916. + 15003, 15006, 15073, 15122, 15759, 16510, 16885, 16916, 16943. Version 2.17 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h index 89fad8feb6..08b20559af 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h @@ -253,3 +253,30 @@ enum __priority_which PRIO_USER = 2 /* WHO is a user ID. */ #define PRIO_USER PRIO_USER }; + +__BEGIN_DECLS + +#ifdef __USE_GNU +/* Modify and return resource limits of a process atomically. */ +# ifndef __USE_FILE_OFFSET64 +extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource, + const struct rlimit *__new_limit, + struct rlimit *__old_limit) __THROW; +# else +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (prlimit, (__pid_t __pid, + enum __rlimit_resource __resource, + const struct rlimit *__new_limit, + struct rlimit *__old_limit), prlimit64); +# else +# define prlimit prlimit64 +# endif +# endif +# ifdef __USE_LARGEFILE64 +extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource, + const struct rlimit64 *__new_limit, + struct rlimit64 *__old_limit) __THROW; +# endif +#endif + +__END_DECLS |