[Commits] r25506 - in /fsf/glibc-2_18-branch/libc: ChangeLog NEWS sysdeps/unix/sysv/linux/sparc/bits/resource.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri May 16 00:07:09 2014
New Revision: 25506

Log:
Import glibc-2.18 for 2014-05-16

Modified:
    fsf/glibc-2_18-branch/libc/ChangeLog
    fsf/glibc-2_18-branch/libc/NEWS
    fsf/glibc-2_18-branch/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h

Modified: fsf/glibc-2_18-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_18-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_18-branch/libc/ChangeLog Fri May 16 00:07:09 2014
@@ -1,3 +1,9 @@
+2014-05-16  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	[BZ #16943]
+	* sysdeps/unix/sysv/linux/sparc/bits/resource.h: Declare prlimit
+	and prlimit64.
+
 2014-05-06  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
         [BZ# 16916]

Modified: fsf/glibc-2_18-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_18-branch/libc/NEWS (original)
+++ fsf/glibc-2_18-branch/libc/NEWS Fri May 16 00:07:09 2014
@@ -9,7 +9,8 @@
 
 * The following bugs are resolved with this release:
 
-  15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510, 16885, 16916.
+  15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510, 16885, 16916,
+  16943.
 
 Version 2.18
 

Modified: fsf/glibc-2_18-branch/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h
==============================================================================
--- fsf/glibc-2_18-branch/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h (original)
+++ fsf/glibc-2_18-branch/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h Fri May 16 00:07:09 2014
@@ -252,3 +252,30 @@
   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

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits