More hiding, including __mempcpy

5 files changed, 11 insertions, 7 deletions

diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c
index f21b16062..e1b808340 100644
--- a/libc/stdio/getdelim.c
+++ b/libc/stdio/getdelim.c
@@ -20,7 +20,7 @@
 
 #define GETDELIM_GROWBY		64
 
-ssize_t attribute_hidden __libc_getdelim(char **__restrict lineptr, size_t *__restrict n,
+ssize_t attribute_hidden __getdelim(char **__restrict lineptr, size_t *__restrict n,
 				   int delimiter, register FILE *__restrict stream)
 {
 	register char *buf;
@@ -74,5 +74,4 @@ ssize_t attribute_hidden __libc_getdelim(char **__restrict lineptr, size_t *__re
 	return pos;
 }
 
-strong_alias(__libc_getdelim,__getdelim)
-weak_alias(__getdelim,getdelim)
+strong_alias(__getdelim,getdelim)
diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c
index 7424dc024..943526abe 100644
--- a/libc/stdio/getline.c
+++ b/libc/stdio/getline.c
@@ -5,12 +5,13 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
-#define __getdelim __libc_getdelim
+#define getdelim __getdelim
 
 #include "_stdio.h"
 
-ssize_t getline(char **__restrict lineptr, size_t *__restrict n,
+ssize_t attribute_hidden __getline(char **__restrict lineptr, size_t *__restrict n,
 				FILE *__restrict stream)
 {
-	return __getdelim(lineptr, n, '\n', stream);
+	return getdelim(lineptr, n, '\n', stream);
 }
+strong_alias(__getline,getline)
diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c
index 358486010..5799005d9 100644
--- a/libc/stdio/open_memstream.c
+++ b/libc/stdio/open_memstream.c
@@ -124,7 +124,7 @@ static const cookie_io_functions_t _oms_io_funcs = {
  * (ie replace the FILE buffer with the cookie buffer and update FILE bufstart,
  * etc. whenever we seek). */
 
-FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
+FILE attribute_hidden *__open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
 {
 	register __oms_cookie *cookie;
 	register FILE *fp;
@@ -160,3 +160,4 @@ FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc)
 
 	return NULL;
 }
+strong_alias(__open_memstream,open_memstream)
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 6de09253c..45ac6f17f 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -14,6 +14,7 @@
  *   Fix failure exit code for failed execve().
  */
 
+#define waitpid __waitpid
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index 688ab7cd5..512317c51 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -5,6 +5,8 @@
  * Dedicated to Toni.  See uClibc/DEDICATION.mjn3 for details.
  */
 
+#define open_memstream __open_memstream
+
 #include "_stdio.h"
 #include <stdarg.h>
 #include <bits/uClibc_va_copy.h>