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