diff options
| -rw-r--r-- | include/stdlib.h | 4 | ||||
| -rw-r--r-- | libc/stdlib/stdlib.c | 3 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sparc/bits/kernel_types.h | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/stdlib.h b/include/stdlib.h index 124dc7329..52f02e4fd 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -209,6 +209,8 @@ libc_hidden_proto(strtoul) __END_NAMESPACE_STD #ifdef __USE_BSD +#include <sys/types.h> /* for u_quad_t */ + /* Convert a string to a quadword integer. */ __extension__ extern long long int strtoq (__const char *__restrict __nptr, @@ -216,7 +218,7 @@ extern long long int strtoq (__const char *__restrict __nptr, __THROW __nonnull ((1)) __wur; /* Convert a string to an unsigned quadword integer. */ __extension__ -extern unsigned long long int strtouq (__const char *__restrict __nptr, +extern u_quad_t strtouq (__const char *__restrict __nptr, char **__restrict __endptr, int __base) __THROW __nonnull ((1)) __wur; #endif /* GCC and use BSD. */ diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index ef92ea4fd..05cc68bdb 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -401,6 +401,9 @@ extern __typeof(__XL_NPP(strtoul)) __XL_NPP(strtoull); libc_hidden_proto(__XL_NPP(strtoull)) strong_alias(__XL_NPP(strtoul),__XL_NPP(strtoull)) libc_hidden_def(__XL_NPP(strtoull)) +#if !defined(L_strtoul_l) +strong_alias(strtoul,strtouq) +#endif #endif diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h index 1b2452446..0cc4bc214 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h @@ -4,9 +4,10 @@ * our private content, and not the kernel header, will win. * -Erik */ -#if ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H +#if ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H && !defined __SPARC_POSIX_TYPES_H #define __ARCH_SPARC_POSIX_TYPES_H #define __ARCH_SPARC64_POSIX_TYPES_H +#define __SPARC_POSIX_TYPES_H # if __WORDSIZE == 64 typedef unsigned long __kernel_size_t; |