|
 |
147e83 |
Related upstream commit:
|
|
|
147e83 |
|
|
|
147e83 |
commit c5c2b7c3fd823fc5c4a52506292a90eba60b0c62
|
|
|
147e83 |
Author: Joseph Myers <joseph@codesourcery.com>
|
|
|
147e83 |
Date: Sat Dec 6 23:40:48 2014 +0000
|
|
|
147e83 |
|
|
|
147e83 |
Fix pthreads getrlimit, gettimeofday namespace (bug 17682).
|
|
|
147e83 |
|
|
|
147e83 |
--- glibc-2.17-c758a686/include/sys/resource.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/sys/resource.h
|
|
|
147e83 |
@@ -14,5 +14,6 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
|
|
|
147e83 |
|
|
|
147e83 |
extern int __setrlimit (enum __rlimit_resource __resource,
|
|
|
147e83 |
const struct rlimit *__rlimits);
|
|
|
147e83 |
+libc_hidden_proto (__getrlimit)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
#endif
|
|
|
147e83 |
--- glibc-2.17-c758a686/resource/getrlimit.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/resource/getrlimit.c
|
|
|
147e83 |
@@ -27,6 +27,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
|
|
|
147e83 |
__set_errno (ENOSYS);
|
|
|
147e83 |
return -1;
|
|
|
147e83 |
}
|
|
|
147e83 |
+libc_hidden_def (__getrlimit)
|
|
|
147e83 |
weak_alias (__getrlimit, getrlimit)
|
|
|
147e83 |
|
|
|
147e83 |
stub_warning (getrlimit)
|
|
|
147e83 |
--- glibc-2.17-c758a686/sysdeps/mach/hurd/getrlimit.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/mach/hurd/getrlimit.c
|
|
|
147e83 |
@@ -43,4 +43,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
|
|
|
147e83 |
|
|
|
147e83 |
return 0;
|
|
|
147e83 |
}
|
|
|
147e83 |
+libc_hidden_def (__getrlimit)
|
|
|
147e83 |
weak_alias (__getrlimit, getrlimit)
|