diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | libc/inet/addr.c | 1 | ||||
| -rw-r--r-- | libc/misc/time/time.c | 1 | ||||
| -rw-r--r-- | libc/stdio/_uintmaxtostr.c | 3 | ||||
| -rw-r--r-- | libc/stdio/old_vfprintf.c | 1 | ||||
| -rw-r--r-- | libc/stdio/vfprintf.c | 1 | ||||
| -rw-r--r-- | libc/stdlib/ptsname.c | 2 | ||||
| -rw-r--r-- | libc/string/wstring.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_uintmaxtostr.h | 2 |
9 files changed, 3 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index c66638c23..9d72e8db8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -112,6 +112,7 @@ install_headers: tar -chf - --exclude .svn $$extra_exclude include \ | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h + $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h ifneq ($(UCLIBC_HAS_FLOATS),y) # Remove floating point related headers since float support is disabled. $(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h diff --git a/libc/inet/addr.c b/libc/inet/addr.c index a03b7575b..f46d54a8f 100644 --- a/libc/inet/addr.c +++ b/libc/inet/addr.c @@ -16,7 +16,6 @@ * Changed to use _int10tostr. */ -#define _uintmaxtostr __libc__uintmaxtostr /* for some reason this does not work here */ #define memmove __memmove diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index 3c47cb879..d7cf1806e 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -129,7 +129,6 @@ * differs (intentionally) from glibc's behavior. */ -#define _uintmaxtostr __libc__uintmaxtostr #define strnlen __strnlen #define _GNU_SOURCE 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/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/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/stdlib/ptsname.c b/libc/stdlib/ptsname.c index 539cbcae2..d4e99a035 100644 --- a/libc/stdlib/ptsname.c +++ b/libc/stdlib/ptsname.c @@ -17,8 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define _uintmaxtostr __libc__uintmaxtostr - #define _ISOC99_SOURCE #include <stdio.h> #include <errno.h> 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> diff --git a/libc/sysdeps/linux/common/bits/uClibc_uintmaxtostr.h b/libc/sysdeps/linux/common/bits/uClibc_uintmaxtostr.h index 726558ad8..92633ffa6 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_uintmaxtostr.h +++ b/libc/sysdeps/linux/common/bits/uClibc_uintmaxtostr.h @@ -100,7 +100,7 @@ typedef enum { * Otherwise, you could overflow your buffer. */ extern char *_uintmaxtostr(char * __restrict bufend, uintmax_t uval, - int base, __UIM_CASE alphacase); + int base, __UIM_CASE alphacase) attribute_hidden; /* TODO -- make this either a (possibly inline) function? */ #ifndef __BCC__ |