summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-16 23:50:43 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:26 +0200
commit916229f02ca6464435146fc86f9cb57b0ac47d8e (patch)
tree467cdaa1cf5dc51fbdf6132bd2385750b3e7d5a0
parent6763a89427834d2e8b929006cabfc0e947bb68fa (diff)
__xpg_strerror_r.c, {ge,se}trlimit.c: use strong_alias_untyped
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--libc/string/__xpg_strerror_r.c8
-rw-r--r--libc/sysdeps/linux/common/getrlimit.c5
-rw-r--r--libc/sysdeps/linux/common/setrlimit.c5
3 files changed, 3 insertions, 15 deletions
diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c
index fb4d44004..5979b1e37 100644
--- a/libc/string/__xpg_strerror_r.c
+++ b/libc/string/__xpg_strerror_r.c
@@ -5,17 +5,11 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-/* Make sure we get proper strerror_r() prototype */
-#define strerror_r _hidestrerror_r
-
#include <features.h>
#include <errno.h>
#include <string.h>
#include "_syserrmsg.h"
-#undef strerror_r
-
-
#ifdef __UCLIBC_HAS_ERRNO_MESSAGES__
extern const char _string_syserrmsgs[] attribute_hidden;
@@ -273,4 +267,4 @@ int __xpg_strerror_r(int errnum, char *strerrbuf, size_t buflen)
#endif /* __UCLIBC_HAS_ERRNO_MESSAGES__ */
libc_hidden_def(__xpg_strerror_r)
-weak_alias(__xpg_strerror_r, strerror_r)
+strong_alias_untyped(__xpg_strerror_r, strerror_r)
diff --git a/libc/sysdeps/linux/common/getrlimit.c b/libc/sysdeps/linux/common/getrlimit.c
index 4d3163f7e..f9d70f37b 100644
--- a/libc/sysdeps/linux/common/getrlimit.c
+++ b/libc/sysdeps/linux/common/getrlimit.c
@@ -7,12 +7,9 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#define getrlimit64 __hide_getrlimit64
#include <sys/syscall.h>
#include <unistd.h>
#include <sys/resource.h>
-#undef getrlimit64
-
/* Only wrap getrlimit if the new ugetrlimit is not present and getrlimit sucks */
@@ -63,5 +60,5 @@ int getrlimit(__rlimit_resource_t resource, struct rlimit *rlimits)
libc_hidden_def(getrlimit)
#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64
-strong_alias(getrlimit, getrlimit64)
+strong_alias_untyped(getrlimit, getrlimit64)
#endif
diff --git a/libc/sysdeps/linux/common/setrlimit.c b/libc/sysdeps/linux/common/setrlimit.c
index ed773f7ae..6817a9c92 100644
--- a/libc/sysdeps/linux/common/setrlimit.c
+++ b/libc/sysdeps/linux/common/setrlimit.c
@@ -7,12 +7,9 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#define setrlimit64 __hide_setrlimit64
#include <sys/syscall.h>
#include <unistd.h>
#include <sys/resource.h>
-#undef setrlimit64
-
/* Only wrap setrlimit if the new usetrlimit is not present and setrlimit sucks */
@@ -65,5 +62,5 @@ int setrlimit(__rlimit_resource_t resource, const struct rlimit *rlimits)
libc_hidden_def(setrlimit)
#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64
-strong_alias(setrlimit, setrlimit64)
+strong_alias_untyped(setrlimit, setrlimit64)
#endif