summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libc/inet/resolv.c45
-rw-r--r--libc/misc/internals/__uClibc_main.c21
-rw-r--r--libc/stdio/__fsetlocking.c4
-rw-r--r--libc/stdio/_stdio.h6
-rw-r--r--libc/stdio/_uintmaxtostr.c3
-rw-r--r--libc/stdio/fgetc.c12
-rw-r--r--libc/stdio/fgets.c4
-rw-r--r--libc/stdio/fputc.c12
-rw-r--r--libc/stdio/getdelim.c5
-rw-r--r--libc/stdio/getline.c7
-rw-r--r--libc/stdio/old_vfprintf.c1
-rw-r--r--libc/stdio/open_memstream.c3
-rw-r--r--libc/stdio/popen.c13
-rw-r--r--libc/stdio/puts.c4
-rw-r--r--libc/stdio/scanf.c1
-rw-r--r--libc/stdio/setbuf.c2
-rw-r--r--libc/stdio/setbuffer.c2
-rw-r--r--libc/stdio/setlinebuf.c2
-rw-r--r--libc/stdio/setvbuf.c3
-rw-r--r--libc/stdio/ungetc.c3
-rw-r--r--libc/stdio/vasprintf.c2
-rw-r--r--libc/stdio/vfprintf.c1
-rw-r--r--libc/string/wstring.c2
23 files changed, 81 insertions, 77 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index bcc4e78f8..31f5456e7 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -137,6 +137,7 @@
#define strncat __strncat
#define strstr __strstr
#define random __random
+#define getservbyport __getservbyport
#define __FORCE_GLIBC
#include <features.h>
@@ -185,15 +186,13 @@ extern char * __nameserver[MAX_SERVERS];
extern int __searchdomains;
extern char * __searchdomain[MAX_SEARCH];
+
#ifdef __UCLIBC_HAS_THREADS__
-#include <pthread.h>
+# include <pthread.h>
extern pthread_mutex_t __resolv_lock;
-# define BIGLOCK __pthread_mutex_lock(&__resolv_lock)
-# define BIGUNLOCK __pthread_mutex_unlock(&__resolv_lock);
-#else
-# define BIGLOCK
-# define BIGUNLOCK
#endif
+#define BIGLOCK __pthread_mutex_lock(&__resolv_lock)
+#define BIGUNLOCK __pthread_mutex_unlock(&__resolv_lock)
@@ -272,10 +271,10 @@ extern int __open_nameservers(void) attribute_hidden;
extern void __close_nameservers(void) attribute_hidden;
extern int __dn_expand(const u_char *, const u_char *, const u_char *,
char *, int);
-extern int __libc_ns_name_uncompress(const u_char *, const u_char *,
+extern int __ns_name_uncompress_internal(const u_char *, const u_char *,
const u_char *, char *, size_t) attribute_hidden;
-extern int __libc_ns_name_ntop(const u_char *, char *, size_t) attribute_hidden;
-extern int __libc_ns_name_unpack(const u_char *, const u_char *, const u_char *,
+extern int __ns_name_ntop_internal(const u_char *, char *, size_t) attribute_hidden;
+extern int __ns_name_unpack_internal(const u_char *, const u_char *, const u_char *,
u_char *, size_t) attribute_hidden;
@@ -658,15 +657,12 @@ int __form_query(int id, const char *name, int type, unsigned char *packet,
#endif
#if defined(L_dnslookup) || defined(L_gethostent)
-
#ifdef __UCLIBC_HAS_THREADS__
+# include <pthread.h>
static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
-# define LOCK __pthread_mutex_lock(&mylock)
-# define UNLOCK __pthread_mutex_unlock(&mylock);
-#else
-# define LOCK
-# define UNLOCK
#endif
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
#endif
#ifdef L_dnslookup
@@ -980,6 +976,7 @@ char * __nameserver[MAX_SERVERS];
int __searchdomains;
char * __searchdomain[MAX_SEARCH];
#ifdef __UCLIBC_HAS_THREADS__
+# include <pthread.h>
pthread_mutex_t __resolv_lock = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ -2399,7 +2396,7 @@ int gethostbyaddr_r (const void *addr, socklen_t len, int type,
int __dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
char *dst, int dstsiz)
{
- int n = __libc_ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
+ int n = __ns_name_uncompress_internal(msg, eom, src, dst, (size_t)dstsiz);
if (n > 0 && dst[0] == '.')
dst[0] = '\0';
@@ -2451,19 +2448,19 @@ static int special(int ch)
* note:
* Root domain returns as "." not "".
*/
-int attribute_hidden __libc_ns_name_uncompress(const u_char *msg, const u_char *eom,
+int attribute_hidden __ns_name_uncompress_internal(const u_char *msg, const u_char *eom,
const u_char *src, char *dst, size_t dstsiz)
{
u_char tmp[NS_MAXCDNAME];
int n;
- if ((n = __libc_ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
+ if ((n = __ns_name_unpack_internal(msg, eom, src, tmp, sizeof tmp)) == -1)
return (-1);
- if (__libc_ns_name_ntop(tmp, dst, dstsiz) == -1)
+ if (__ns_name_ntop_internal(tmp, dst, dstsiz) == -1)
return (-1);
return (n);
}
-strong_alias(__libc_ns_name_uncompress,__ns_name_uncompress)
+strong_alias(__ns_name_uncompress_internal,__ns_name_uncompress)
/*
@@ -2475,7 +2472,7 @@ strong_alias(__libc_ns_name_uncompress,__ns_name_uncompress)
* The root is returned as "."
* All other domains are returned in non absolute form
*/
-int attribute_hidden __libc_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
+int attribute_hidden __ns_name_ntop_internal(const u_char *src, char *dst, size_t dstsiz) {
const u_char *cp;
char *dn, *eom;
u_char c;
@@ -2544,7 +2541,7 @@ int attribute_hidden __libc_ns_name_ntop(const u_char *src, char *dst, size_t ds
*dn++ = '\0';
return (dn - dst);
}
-strong_alias(__libc_ns_name_ntop,__ns_name_ntop)
+strong_alias(__ns_name_ntop_internal,__ns_name_ntop)
/*
* ns_name_unpack(msg, eom, src, dst, dstsiz)
@@ -2552,7 +2549,7 @@ strong_alias(__libc_ns_name_ntop,__ns_name_ntop)
* return:
* -1 if it fails, or consumed octets if it succeeds.
*/
-int attribute_hidden __libc_ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
+int attribute_hidden __ns_name_unpack_internal(const u_char *msg, const u_char *eom, const u_char *src,
u_char *dst, size_t dstsiz)
{
const u_char *srcp, *dstlim;
@@ -2619,5 +2616,5 @@ int attribute_hidden __libc_ns_name_unpack(const u_char *msg, const u_char *eom,
len = srcp - src;
return (len);
}
-strong_alias(__libc_ns_name_unpack,__ns_name_unpack)
+strong_alias(__ns_name_unpack_internal,__ns_name_unpack)
#endif /* L_ns_name */
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index c3f8a548c..cd3b1b061 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -1,6 +1,8 @@
/*
- * Manuel Novoa III Feb 2001
- * Erik Andersen 2002-2004
+ * Copyright (C) Feb 2001 Manuel Novoa III
+ * Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*
* __uClibc_main is the routine to be called by all the arch-specific
* versions of crt1.S in uClibc.
@@ -11,6 +13,11 @@
* avoided in the static library case.
*/
+#define getgid __getgid
+#define getuid __getuid
+#define getegid __getegid
+#define geteuid __geteuid
+
#define _ERRNO_H
#include <features.h>
#include <unistd.h>
@@ -75,7 +82,8 @@ const char *__progname = 0;
#endif
extern int __libc_fcntl(int fd, int cmd, ...);
-extern int __libc_open(const char *file, int flags, ...);
+
+#ifdef __ARCH_HAS_MMU__
static void __check_one_fd(int fd, int mode)
{
@@ -84,7 +92,7 @@ static void __check_one_fd(int fd, int mode)
{
/* The descriptor is probably not open, so try to use /dev/null */
struct stat st;
- int nullfd = __libc_open(_PATH_DEVNULL, mode);
+ int nullfd = __open(_PATH_DEVNULL, mode);
/* /dev/null is major=1 minor=3. Make absolutely certain
* that is in fact the device that we have opened and not
* some other wierd file... */
@@ -114,6 +122,7 @@ static int __check_suid(void)
}
return 1;
}
+#endif
/* __uClibc_init completely initialize uClibc so it is ready to use.
*
@@ -222,12 +231,12 @@ __uClibc_main(int (*main)(int, char **, char **), int argc,
while (*aux_dat) {
ElfW(auxv_t) *auxv_entry = (ElfW(auxv_t) *) aux_dat;
if (auxv_entry->a_type <= AT_EGID) {
- memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
+ __memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
}
aux_dat += 2;
}
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#if !defined(SHARED) && defined(__UCLIBC_HAS_THREADS_NATIVE__)
{
extern void _dl_aux_init (ElfW(auxv_t) *av);
diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 77690e269..5b6070cc3 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -15,7 +15,7 @@
* glibc treats invalid locking_mode args as FSETLOCKING_INTERNAL.
*/
-int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode)
+int attribute_hidden __fsetlocking_internal(FILE *stream, int locking_mode)
{
#ifdef __UCLIBC_HAS_THREADS__
int current = 1 + (stream->__user_locking & 1);
@@ -44,4 +44,4 @@ int attribute_hidden __libc_fsetlocking(FILE *stream, int locking_mode)
#endif
}
-strong_alias(__libc_fsetlocking,__fsetlocking)
+strong_alias(__fsetlocking_internal,__fsetlocking)
diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h
index fdab8b8dc..858f2716b 100644
--- a/libc/stdio/_stdio.h
+++ b/libc/stdio/_stdio.h
@@ -273,6 +273,8 @@ extern int __stdio_trans2w(FILE *__restrict stream) attribute_hidden;
extern int __stdio_trans2r_o(FILE *__restrict stream, int oflag) attribute_hidden;
extern int __stdio_trans2w_o(FILE *__restrict stream, int oflag) attribute_hidden;
+extern int __setvbuf (FILE *__restrict __stream, char *__restrict __buf,
+ int __modes, size_t __n) __THROW attribute_hidden;
/**********************************************************************/
#ifdef __STDIO_BUFFERS
@@ -371,7 +373,7 @@ extern size_t __fwrite_unlocked(const void *__restrict ptr, size_t size,
extern size_t __fread_unlocked(void *__restrict ptr, size_t size,
size_t nmemb, FILE *__restrict stream) attribute_hidden;
-extern int __libc_fputc_unlocked(int c, FILE *stream) attribute_hidden;
+extern int __fputc_unlocked_internal(int c, FILE *stream) attribute_hidden;
extern int __fflush_unlocked(FILE *stream) attribute_hidden;
@@ -381,7 +383,7 @@ extern void __clearerr_unlocked(FILE *stream);
extern int __feof_unlocked(FILE *stream);
extern int __ferror_unlocked(FILE *stream);
-extern int __libc_fgetc_unlocked(FILE *stream) attribute_hidden;
+extern int __fgetc_unlocked_internal(FILE *stream) attribute_hidden;
extern char *__fgets_unlocked(char *__restrict s, int n,
FILE * __restrict stream) attribute_hidden;
diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c
index 847d23560..bf92506d5 100644
--- a/libc/stdio/_uintmaxtostr.c
+++ b/libc/stdio/_uintmaxtostr.c
@@ -17,7 +17,7 @@
#define INTERNAL_DIV_MOD
#endif
-char attribute_hidden *__libc__uintmaxtostr(register char * __restrict bufend, uintmax_t uval,
+char attribute_hidden *_uintmaxtostr(register char * __restrict bufend, uintmax_t uval,
int base, __UIM_CASE alphacase)
{
int negative;
@@ -149,4 +149,3 @@ char attribute_hidden *__libc__uintmaxtostr(register char * __restrict bufend, u
return bufend;
}
-strong_alias(__libc__uintmaxtostr,_uintmaxtostr)
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index 78fca8422..be9322714 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -14,7 +14,7 @@
#ifdef __DO_UNLOCKED
-int attribute_hidden __libc_fgetc_unlocked(FILE *stream)
+int attribute_hidden __fgetc_unlocked_internal(FILE *stream)
{
__STDIO_STREAM_VALIDATE(stream);
@@ -69,12 +69,12 @@ int attribute_hidden __libc_fgetc_unlocked(FILE *stream)
return EOF;
}
-strong_alias(__libc_fgetc_unlocked,__fgetc_unlocked)
-weak_alias(__fgetc_unlocked,fgetc_unlocked)
-weak_alias(__fgetc_unlocked,getc_unlocked)
+strong_alias(__fgetc_unlocked_internal,__fgetc_unlocked)
+weak_alias(__fgetc_unlocked_internal,fgetc_unlocked)
+weak_alias(__fgetc_unlocked_internal,getc_unlocked)
#ifndef __UCLIBC_HAS_THREADS__
-weak_alias(__fgetc_unlocked,fgetc)
-weak_alias(__fgetc_unlocked,getc)
+weak_alias(__fgetc_unlocked_internal,fgetc)
+weak_alias(__fgetc_unlocked_internal,getc)
#endif
#elif defined __UCLIBC_HAS_THREADS__
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 743a2ea54..52c856f35 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -5,8 +5,6 @@
* Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
*/
-#define __fgetc_unlocked __libc_fgetc_unlocked
-
#include "_stdio.h"
#ifdef __DO_UNLOCKED
@@ -36,7 +34,7 @@ char attribute_hidden *__fgets_unlocked(char *__restrict s, int n,
break;
}
} else {
- if ((c = __fgetc_unlocked(stream)) == EOF) {
+ if ((c = __fgetc_unlocked_internal(stream)) == EOF) {
if (__FERROR_UNLOCKED(stream)) {
goto ERROR;
}
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index 46ebb163c..b319263a1 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -14,7 +14,7 @@
#ifdef __DO_UNLOCKED
-int attribute_hidden __libc_fputc_unlocked(int c, register FILE *stream)
+int attribute_hidden __fputc_unlocked_internal(int c, register FILE *stream)
{
__STDIO_STREAM_VALIDATE(stream);
@@ -69,12 +69,12 @@ int attribute_hidden __libc_fputc_unlocked(int c, register FILE *stream)
return EOF;
}
-strong_alias(__libc_fputc_unlocked,__fputc_unlocked)
-weak_alias(__fputc_unlocked,fputc_unlocked)
-weak_alias(__fputc_unlocked,putc_unlocked)
+strong_alias(__fputc_unlocked_internal,__fputc_unlocked)
+weak_alias(__fputc_unlocked_internal,fputc_unlocked)
+weak_alias(__fputc_unlocked_internal,putc_unlocked)
#ifndef __UCLIBC_HAS_THREADS__
-weak_alias(__fputc_unlocked,fputc)
-weak_alias(__fputc_unlocked,putc)
+weak_alias(__fputc_unlocked_internal,fputc)
+weak_alias(__fputc_unlocked_internal,putc)
#endif
#elif defined __UCLIBC_HAS_THREADS__
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/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index abf535a16..aafc4a1ed 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -127,7 +127,6 @@
/**************************************************************************/
-#define _uintmaxtostr __libc__uintmaxtostr
#define strnlen __strnlen
#define _ISOC99_SOURCE /* for ULLONG primarily... */
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..2e9985a39 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -14,6 +14,8 @@
* Fix failure exit code for failed execve().
*/
+#define waitpid __waitpid
+#define execl __execl
#include <stdio.h>
#include <stdlib.h>
@@ -30,14 +32,11 @@
#endif
#ifdef __UCLIBC_HAS_THREADS__
-#include <pthread.h>
+# include <pthread.h>
static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
-# define LOCK __pthread_mutex_lock(&mylock)
-# define UNLOCK __pthread_mutex_unlock(&mylock);
-#else
-# define LOCK ((void) 0)
-# define UNLOCK ((void) 0)
-#endif
+#endif
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
#ifndef VFORK_LOCK
# define VFORK_LOCK LOCK
diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c
index 37ae243bf..3a510325b 100644
--- a/libc/stdio/puts.c
+++ b/libc/stdio/puts.c
@@ -5,8 +5,6 @@
* Dedicated to Toni. See uClibc/DEDICATION.mjn3 for details.
*/
-#define __fputc_unlocked __libc_fputc_unlocked
-
#include "_stdio.h"
int puts(register const char * __restrict s)
@@ -24,7 +22,7 @@ int puts(register const char * __restrict s)
/* Note: Nonportable as fputs need only return nonnegative on success. */
if ((n = __fputs_unlocked(s, stream)) != EOF) {
++n;
- if (__fputc_unlocked('\n', stream) == EOF) {
+ if (__fputc_unlocked_internal('\n', stream) == EOF) {
n = EOF;
}
}
diff --git a/libc/stdio/scanf.c b/libc/stdio/scanf.c
index 1d6522417..98db1c3ac 100644
--- a/libc/stdio/scanf.c
+++ b/libc/stdio/scanf.c
@@ -46,6 +46,7 @@
#define wcslen __wcslen
#define mbsrtowcs __mbsrtowcs
#define mbrtowc __mbrtowc
+#define ungetc __ungetc
#define _ISOC99_SOURCE /* for LLONG_MAX primarily... */
#define _GNU_SOURCE
diff --git a/libc/stdio/setbuf.c b/libc/stdio/setbuf.c
index 21158638b..02a4736ac 100644
--- a/libc/stdio/setbuf.c
+++ b/libc/stdio/setbuf.c
@@ -10,6 +10,6 @@
void setbuf(FILE * __restrict stream, register char * __restrict buf)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, buf, ((buf != NULL) ? _IOFBF : _IONBF), BUFSIZ);
+ __setvbuf(stream, buf, ((buf != NULL) ? _IOFBF : _IONBF), BUFSIZ);
#endif
}
diff --git a/libc/stdio/setbuffer.c b/libc/stdio/setbuffer.c
index ccd4d275e..d1f12a1af 100644
--- a/libc/stdio/setbuffer.c
+++ b/libc/stdio/setbuffer.c
@@ -16,6 +16,6 @@ void setbuffer(FILE * __restrict stream, register char * __restrict buf,
size_t size)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size);
+ __setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size);
#endif
}
diff --git a/libc/stdio/setlinebuf.c b/libc/stdio/setlinebuf.c
index 6147fa8f4..56e89e11b 100644
--- a/libc/stdio/setlinebuf.c
+++ b/libc/stdio/setlinebuf.c
@@ -15,6 +15,6 @@
void setlinebuf(FILE * __restrict stream)
{
#ifdef __STDIO_BUFFERS
- setvbuf(stream, NULL, _IOLBF, (size_t) 0);
+ __setvbuf(stream, NULL, _IOLBF, (size_t) 0);
#endif
}
diff --git a/libc/stdio/setvbuf.c b/libc/stdio/setvbuf.c
index 3fe62c6a8..d12d1576a 100644
--- a/libc/stdio/setvbuf.c
+++ b/libc/stdio/setvbuf.c
@@ -14,7 +14,7 @@
#error Assumption violated for buffering mode flags
#endif
-int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
+int attribute_hidden __setvbuf(register FILE * __restrict stream, register char * __restrict buf,
int mode, size_t size)
{
#ifdef __STDIO_BUFFERS
@@ -104,3 +104,4 @@ int setvbuf(register FILE * __restrict stream, register char * __restrict buf,
#endif
}
+strong_alias(__setvbuf,setvbuf)
diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c
index 1b9197a18..de3f1d16b 100644
--- a/libc/stdio/ungetc.c
+++ b/libc/stdio/ungetc.c
@@ -24,7 +24,7 @@
* (See section 7.19.6.2 of the C9X rationale -- WG14/N897.)
*/
-int ungetc(int c, register FILE *stream)
+int attribute_hidden __ungetc(int c, register FILE *stream)
{
__STDIO_AUTO_THREADLOCK_VAR;
@@ -75,3 +75,4 @@ int ungetc(int c, register FILE *stream)
return c;
}
+strong_alias(__ungetc,ungetc)
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>
diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c
index 4675dacc2..e3f389a6b 100644
--- a/libc/stdio/vfprintf.c
+++ b/libc/stdio/vfprintf.c
@@ -88,7 +88,6 @@
* treats this as an error.
*/
-#define _uintmaxtostr __libc__uintmaxtostr
#define strnlen __strnlen
#define wcslen __wcslen
#define wcsnlen __wcsnlen
diff --git a/libc/string/wstring.c b/libc/string/wstring.c
index 70e0be854..f1aaf9c8d 100644
--- a/libc/string/wstring.c
+++ b/libc/string/wstring.c
@@ -26,8 +26,6 @@
* mapping of signal strings (alpha, mips, hppa, sparc).
*/
-#define _uintmaxtostr __libc__uintmaxtostr
-
#define _GNU_SOURCE
#include <features.h>
#include <string.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 03:53:13 +0000