]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
SPARC: add prlimit and prlimit64 in <bits/resource.h> (BZ #16943)
authorAurelien Jarno <aurelien@aurel32.net>
Thu, 15 May 2014 22:04:41 +0000 (00:04 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Thu, 15 May 2014 22:18:50 +0000 (00:18 +0200)
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)

ChangeLog
NEWS
sysdeps/unix/sysv/linux/sparc/bits/resource.h

index f102247d570a111b032f786fac6d0e55f759963c..16ff2273929328552be57b66627c0b4c29881cb1 100644 (file)
--- 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 4b66e216c82c0d9e9066a92a35015a81a780b8c4..8702a3a51f4ccabd9de12f19579ab7d11715409d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.16.1
 * The following bugs are resolved with this release:
 
   6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831, 15073,
-  16510, 16885, 16916.
+  16510, 16885, 16916, 16943.
 
 Version 2.16
 
index 89fad8feb66a8867a370f83dab93a3dcd255a661..08b20559afe169b739a134589ef343b9565a339e 100644 (file)
@@ -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