diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/Makefile | 9 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 236 | ||||
| -rw-r--r-- | wcsmbs/wcscasecmp.c | 56 | ||||
| -rw-r--r-- | wcsmbs/wcsncase.c | 55 | ||||
| -rw-r--r-- | wcsmbs/wcstof.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstold.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstoll.c (renamed from wcsmbs/wcstoq.c) | 2 | ||||
| -rw-r--r-- | wcsmbs/wcstoull.c (renamed from wcsmbs/wcstouq.c) | 2 |
8 files changed, 273 insertions, 91 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 929798da42..76f0fd03b9 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -30,10 +30,11 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ btowc wctob mbsinit \ mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \ mbsnrtowcs wcsnrtombs \ - wcstol wcstoul wcstoq wcstouq wcstod wcstold wcstof \ + wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \ wcscoll wcsxfrm \ wcwidth wcswidth \ - wcscoll_l wcsxfrm_l + wcscoll_l wcsxfrm_l \ + wcscasecmp wcsncase include ../Rules @@ -42,8 +43,8 @@ CFLAGS-wcswidth.c = -I../wctype CFLAGS-wcstol.c = -I../stdlib CFLAGS-wcstoul.c = -I../stdlib -CFLAGS-wcstoq.c = -I../stdlib -CFLAGS-wcstouq.c = -I../stdlib +CFLAGS-wcstoll.c = -I../stdlib +CFLAGS-wcstoull.c = -I../stdlib CFLAGS-wcstod.c = -I../stdlib CFLAGS-wcstold.c = -I../stdlib CFLAGS-wcstof.c = -I../stdlib diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 597a03d735..5247a866d3 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -64,16 +64,18 @@ typedef struct /* Copy SRC to DEST. */ -extern wchar_t *wcscpy __P ((wchar_t *__dest, __const wchar_t *__src)); +extern wchar_t *wcscpy __P ((wchar_t *__restrict __dest, + __const wchar_t *__restrict __src)); /* Copy no more than N wide-characters of SRC to DEST. */ -extern wchar_t *wcsncpy __P ((wchar_t *__dest, __const wchar_t *__src, - size_t __n)); +extern wchar_t *wcsncpy __P ((wchar_t *__restrict __dest, + __const wchar_t *__restrict __src, size_t __n)); /* Append SRC onto DEST. */ -extern wchar_t *wcscat __P ((wchar_t *__dest, __const wchar_t *__src)); +extern wchar_t *wcscat __P ((wchar_t *__restrict __dest, + __const wchar_t *__restrict __src)); /* Append no more than N wide-characters of SRC onto DEST. */ -extern wchar_t *wcsncat __P ((wchar_t *__dest, __const wchar_t *__src, - size_t __n)); +extern wchar_t *wcsncat __P ((wchar_t *__restrict __dest, + __const wchar_t *__restrict __src, size_t __n)); /* Compare S1 and S2. */ extern int wcscmp __P ((__const wchar_t *__s1, __const wchar_t *__s2)); @@ -81,13 +83,26 @@ extern int wcscmp __P ((__const wchar_t *__s1, __const wchar_t *__s2)); extern int wcsncmp __P ((__const wchar_t *__s1, __const wchar_t *__s2, size_t __n)); +#ifdef __USE_GNU +/* Compare S1 and S2, ignoring case. */ +extern int __wcscasecmp __P ((__const wchar_t *__s1, __const wchar_t *__s2)); +extern int wcscasecmp __P ((__const wchar_t *__s1, __const wchar_t *__s2)); + +/* Compare no more than N chars of S1 and S2, ignoring case. */ +extern int __wcsncasecmp __P ((__const wchar_t *__s1, __const wchar_t *__s2, + size_t __n)); +extern int wcsncasecmp __P ((__const wchar_t *__s1, __const wchar_t *__s2, + size_t __n)); +#endif + /* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE category of the current locale. */ extern int wcscoll __P ((__const wchar_t *__s1, __const wchar_t *__s2)); /* Transform S2 into array pointed to by S1 such that if wcscmp is applied to two transformed strings the result is the as applying `wcscoll' to the original strings. */ -extern size_t wcsxfrm __P ((wchar_t *__s1, __const wchar_t *__s2, size_t __n)); +extern size_t wcsxfrm __P ((wchar_t *__restrict __s1, + __const wchar_t *__restrict __s2, size_t __n)); #ifdef __USE_GNU /* Similar to the two functions above but take the information from @@ -97,12 +112,12 @@ extern size_t wcsxfrm __P ((wchar_t *__s1, __const wchar_t *__s2, size_t __n)); /* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE category of the given locale. */ extern int __wcscoll_l __P ((__const wchar_t *__s1, __const wchar_t *__s2, - __locale_t loc)); + __locale_t __loc)); /* Transform S2 into array pointed to by S1 such that if wcscmp is applied to two transformed strings the result is the as applying `wcscoll' to the original strings. */ extern size_t __wcsxfrm_l __P ((wchar_t *__s1, __const wchar_t *__s2, - size_t __n, __locale_t loc)); + size_t __n, __locale_t __loc)); #endif /* Duplicate S, returning an identical malloc'd string. */ @@ -127,8 +142,9 @@ extern wchar_t *wcspbrk __P ((__const wchar_t *__wcs, extern wchar_t *wcsstr __P ((__const wchar_t *__haystack, __const wchar_t *__needle)); /* Divide WCS into tokens separated by characters in DELIM. */ -extern wchar_t *wcstok __P ((wchar_t *__s, __const wchar_t *__delim, - wchar_t **ptr)); +extern wchar_t *wcstok __P ((wchar_t *__restrict __s, + __const wchar_t *__restrict __delim, + wchar_t **__restrict __ptr)); /* Return the number of wide-characters in S. */ extern size_t wcslen __P ((__const wchar_t *__s)); @@ -138,12 +154,12 @@ extern size_t wcslen __P ((__const wchar_t *__s)); extern wchar_t *wmemchr __P ((__const wchar_t *__s, wchar_t __c, size_t __n)); /* Compare N bytes of S1 and S2. */ -extern int wmemcmp __P ((__const wchar_t *__s1, __const wchar_t *__s2, - size_t __n)); +extern int wmemcmp __P ((__const wchar_t *__restrict __s1, + __const wchar_t *__restrict __s2, size_t __n)); /* Copy N bytes of SRC to DEST. */ -extern wchar_t *wmemcpy __P ((wchar_t *__s1, __const wchar_t *__s2, - size_t __n)); +extern wchar_t *wmemcpy __P ((wchar_t *__restrict __s1, + __const wchar_t *__restrict __s2, size_t __n)); /* Copy N bytes of SRC to DEST, guaranteeing correct behavior for overlapping strings. */ @@ -168,55 +184,73 @@ extern int mbsinit __P ((__const mbstate_t *__ps)); /* Write wide character representation of multibyte character pointed to by S to PWC. */ -extern size_t __mbrtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n, - mbstate_t *__p)); -extern size_t mbrtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n, +extern size_t __mbrtowc __P ((wchar_t *__restrict __pwc, + __const char *__restrict __s, size_t __n, + mbstate_t *__restrict __p)); +extern size_t mbrtowc __P ((wchar_t *__restrict __pwc, + __const char *__restrict __s, size_t __n, mbstate_t *__p)); /* Write multibyte representation of wide character WC to S. */ -extern size_t __wcrtomb __P ((char *__s, wchar_t __wc, mbstate_t *__ps)); -extern size_t wcrtomb __P ((char *__s, wchar_t __wc, mbstate_t *__ps)); +extern size_t __wcrtomb __P ((char *__restrict __s, wchar_t __wc, + mbstate_t *__restrict __ps)); +extern size_t wcrtomb __P ((char *__restrict __s, wchar_t __wc, + mbstate_t *__restrict __ps)); /* Return number of bytes in multibyte character pointed to by S. */ -extern size_t __mbrlen __P ((__const char *__s, size_t __n, mbstate_t *__ps)); -extern size_t mbrlen __P ((__const char *__s, size_t __n, mbstate_t *__ps)); +extern size_t __mbrlen __P ((__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps)); +extern size_t mbrlen __P ((__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps)); #if defined (__OPTIMIZE__) \ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) /* Define inline function as optimization. */ -extern __inline size_t mbrlen (__const char *s, size_t n, mbstate_t *ps) -{ return ps != NULL ? __mbrtowc (NULL, s, n, ps) : __mbrlen (s, n, NULL); } +extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n, + mbstate_t *__restrict __ps) +{ return (__ps != NULL + ? __mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); } #endif /* Write wide character representation of multibyte character string SRC to DST. */ -extern size_t __mbsrtowcs __P ((wchar_t *__dst, __const char **__src, - size_t __len, mbstate_t *__ps)); -extern size_t mbsrtowcs __P ((wchar_t *__dst, __const char **__src, - size_t __len, mbstate_t *__ps)); +extern size_t __mbsrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)); +extern size_t mbsrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)); /* Write multibyte character representation of wide character string SRC to DST. */ -extern size_t __wcsrtombs __P ((char *__dst, __const wchar_t **__src, - size_t __len, mbstate_t *__ps)); -extern size_t wcsrtombs __P ((char *__dst, __const wchar_t **__src, - size_t __len, mbstate_t *__ps)); +extern size_t __wcsrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)); +extern size_t wcsrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __len, mbstate_t *__restrict __ps)); #ifdef __USE_GNU /* Write wide character representation of at most NMC bytes of the multibyte character string SRC to DST. */ -extern size_t __mbsnrtowcs __P ((wchar_t *__dst, __const char **__src, - size_t __nmc, size_t __len, mbstate_t *__ps)); -extern size_t mbsnrtowcs __P ((wchar_t *__dst, __const char **__src, - size_t __nmc, size_t __len, mbstate_t *__ps)); +extern size_t __mbsnrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, size_t __nmc, + size_t __len, mbstate_t *__restrict __ps)); +extern size_t mbsnrtowcs __P ((wchar_t *__restrict __dst, + __const char **__restrict __src, size_t __nmc, + size_t __len, mbstate_t *__restrict __ps)); /* Write multibyte character representation of at most NWC characters from the wide character string SRC to DST. */ -extern size_t __wcsnrtombs __P ((char *__dst, __const wchar_t **__src, - size_t __nwc, size_t __len, mbstate_t *__ps)); -extern size_t wcsnrtombs __P ((char *__dst, __const wchar_t **__src, - size_t __nwc, size_t __len, mbstate_t *__ps)); +extern size_t __wcsnrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __nwc, size_t __len, + mbstate_t *__restrict __ps)); +extern size_t wcsnrtombs __P ((char *__restrict __dst, + __const wchar_t **__restrict __src, + size_t __nwc, size_t __len, + mbstate_t *__restrict __ps)); /* The following functions are extensions found in X/Open CAE. */ @@ -232,92 +266,124 @@ extern int wcswidth __P ((__const wchar_t *__s, size_t __n)); /* Convert initial portion of the wide string NPTR to `double' representation. */ -extern double wcstod __P ((__const wchar_t *__nptr, wchar_t **__endptr)); +extern double wcstod __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)); #ifdef __USE_GNU /* Likewise for `float' and `long double' sizes of floating-point numbers. */ -extern float wcstof __P ((__const wchar_t *__nptr, wchar_t **__endptr)); -extern __long_double_t wcstold __P ((__const wchar_t *__nptr, - wchar_t **__endptr)); +extern float wcstof __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)); +extern __long_double_t wcstold __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr)); #endif /* GNU */ /* Convert initial portion of wide string NPTR to `long int' representation. */ -extern long int wcstol __P ((__const wchar_t *__nptr, wchar_t **__endptr, - int __base)); +extern long int wcstol __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)); /* Convert initial portion of wide string NPTR to `unsigned long int' representation. */ -extern unsigned long int wcstoul __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __base)); +extern unsigned long int wcstoul __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base)); -#if defined (__GNUC__) && defined (__USE_GNU) +#if defined __GNUC__ && defined __USE_GNU /* Convert initial portion of wide string NPTR to `long int' representation. */ -extern long long int wcstoq __P ((__const wchar_t *__nptr, wchar_t **__endptr, - int __base)); +extern long long int wcstoq __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)); /* Convert initial portion of wide string NPTR to `unsigned long long int' representation. */ -extern unsigned long long int wcstouq __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __base)); +extern unsigned long long int wcstouq __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base)); #endif /* GCC and use GNU. */ +#if defined __USE_ISOC9X || (defined __GNUC__ && defined __USE_GNU) +/* Convert initial portion of wide string NPTR to `long int' + representation. */ +extern long long int wcstoll __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base)); + +/* Convert initial portion of wide string NPTR to `unsigned long long int' + representation. */ +extern unsigned long long int wcstoull __P ((__const wchar_t * + __restrict __nptr, + wchar_t **__restrict __endptr, + int __base)); +#endif /* ISO C 9X or GCC and GNU. */ + /* The internal entry points for `wcstoX' take an extra flag argument saying whether or not to parse locale-dependent number grouping. */ -extern double __wcstod_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __group)); -extern float __wcstof_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __group)); -extern __long_double_t __wcstold_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, +extern double __wcstod_internal __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __group)); +extern float __wcstof_internal __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __group)); +extern __long_double_t __wcstold_internal __P ((__const wchar_t * + __restrict __nptr, + wchar_t **__restrict __endptr, int __group)); -extern long int __wcstol_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __base, - int __group)); -extern unsigned long int __wcstoul_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, +extern long int __wcstol_internal __P ((__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base, int __group)); +extern unsigned long int __wcstoul_internal __P ((__const wchar_t * + __restrict __nptr, + wchar_t ** + __restrict __endptr, int __base, int __group)); #if defined __GNUC__ && defined __USE_GNU -extern long long int __wcstoq_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, int __base, - int __group)); -extern unsigned long long int __wcstouq_internal __P ((__const wchar_t *__nptr, - wchar_t **__endptr, - int __base, - int __group)); +extern long long int __wcstoll_internal __P ((__const wchar_t * + __restrict __nptr, + wchar_t **__restrict __endptr, + int __base, int __group)); +extern unsigned long long int __wcstoull_internal __P ((__const wchar_t * + __restrict __nptr, + wchar_t ** + __restrict __endptr, + int __base, + int __group)); #endif /* GCC and use GNU. */ #if defined (__OPTIMIZE__) && __GNUC__ >= 2 /* Define inline functions which call the internal entry points. */ -extern __inline double wcstod (__const wchar_t *__nptr, wchar_t **__endptr) +extern __inline double wcstod (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr) { return __wcstod_internal (__nptr, __endptr, 0); } -extern __inline long int wcstol (__const wchar_t *__nptr, - wchar_t **__endptr, int __base) +extern __inline long int wcstol (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base) { return __wcstol_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long int wcstoul (__const wchar_t *__nptr, - wchar_t **__endptr, int __base) +extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base) { return __wcstoul_internal (__nptr, __endptr, __base, 0); } #ifdef __USE_GNU -extern __inline float wcstof (__const wchar_t *__nptr, wchar_t **__endptr) +extern __inline float wcstof (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr) { return __wcstof_internal (__nptr, __endptr, 0); } -extern __inline __long_double_t wcstold (__const wchar_t *__nptr, - wchar_t **__endptr) +extern __inline __long_double_t wcstold (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr) { return __wcstold_internal (__nptr, __endptr, 0); } -extern __inline long long int wcstoq (__const wchar_t *__nptr, - wchar_t **__endptr, int __base) -{ return __wcstoq_internal (__nptr, __endptr, __base, 0); } -extern __inline unsigned long long int wcstouq (__const wchar_t *__nptr, - wchar_t **__endptr, int __base) -{ return __wcstouq_internal (__nptr, __endptr, __base, 0); } +extern __inline long long int wcstoq (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base) +{ return __wcstoll_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long long int wcstouq (__const wchar_t * + __restrict __nptr, + wchar_t **__restrict __endptr, + int __base) +{ return __wcstoull_internal (__nptr, __endptr, __base, 0); } #endif /* Use GNU. */ #endif /* Optimizing GCC >=2. */ diff --git a/wcsmbs/wcscasecmp.c b/wcsmbs/wcscasecmp.c new file mode 100644 index 0000000000..74908229a0 --- /dev/null +++ b/wcsmbs/wcscasecmp.c @@ -0,0 +1,56 @@ +/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include <wctype.h> +#include <wchar.h> + +#ifndef weak_alias +# define __wcscasecmp wcscasecmp +#endif + +/* Compare S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, + equal to or greater than S2. */ +int +__wcscasecmp (s1, s2) + const wchar_t *s1; + const wchar_t *s2; +{ + wint_t c1, c2; + + if (s1 == s2) + return 0; + + do + { + c1 = towlower (*s1++); + c2 = towlower (*s2++); + if (c1 == '\0') + break; + } + while (c1 == c2); + + return c1 - c2; +} +#ifdef weak_alias +weak_alias (__wcscasecmp, wcscasecmp) +#endif diff --git a/wcsmbs/wcsncase.c b/wcsmbs/wcsncase.c new file mode 100644 index 0000000000..c5b10c57a4 --- /dev/null +++ b/wcsmbs/wcsncase.c @@ -0,0 +1,55 @@ +/* Compare at most N wide characters of two strings without taking care + for the case. + Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <wchar.h> +#include <wctype.h> + +#ifndef weak_alias +# define __wcsncasecmp wcsncasecmp +#endif + +/* Compare no more than N wide characters of S1 and S2, + ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less + than, equal to or greater than S2. */ +int +__wcsncasecmp (s1, s2, n) + const wchar_t *s1; + const wchar_t *s2; + size_t n; +{ + wint_t c1, c2; + + if (s1 == s2 || n == 0) + return 0; + + do + { + c1 = (wint_t) towlower (*s1++); + c2 = (wint_t) towlower (*s2++); + if (c1 == L'\0' || c1 != c2) + return c1 - c2; + } while (--n > 0); + + return c1 - c2; +} +#ifdef weak_alias +weak_alias (__wcsncasecmp, wcsncasecmp) +#endif diff --git a/wcsmbs/wcstof.c b/wcsmbs/wcstof.c index 01a8950ed4..7d91cf33d6 100644 --- a/wcsmbs/wcstof.c +++ b/wcsmbs/wcstof.c @@ -25,7 +25,7 @@ #define FLT LDBL #define STRTOF wcstof #define MPN2FLOAT __mpn_construct_float -#define FLOAT_HUGE_VAL HUGE_VALf +#define FLOAT_HUGE_VAL HUGE_VALF #define USE_WIDE_CHAR 1 #include "../stdlib/strtod.c" diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c index 1da8062b80..4cb68af1f8 100644 --- a/wcsmbs/wcstold.c +++ b/wcsmbs/wcstold.c @@ -25,7 +25,7 @@ #define FLT LDBL #define STRTOF wcstold #define MPN2FLOAT __mpn_construct_long_double -#define FLOAT_HUGE_VAL HUGE_VALl +#define FLOAT_HUGE_VAL HUGE_VALL #define USE_WIDE_CHAR 1 #include "../stdlib/strtod.c" diff --git a/wcsmbs/wcstoq.c b/wcsmbs/wcstoll.c index a765ca6985..b3e9ac0093 100644 --- a/wcsmbs/wcstoq.c +++ b/wcsmbs/wcstoll.c @@ -21,3 +21,5 @@ #define QUAD 1 #include "wcstol.c" + +weak_alias (wcstoll, wcstoq) diff --git a/wcsmbs/wcstouq.c b/wcsmbs/wcstoull.c index 49a5daa4db..a33d3aed6b 100644 --- a/wcsmbs/wcstouq.c +++ b/wcsmbs/wcstoull.c @@ -21,3 +21,5 @@ #define QUAD 1 #include "wcstoul.c" + +weak_alias (wcstoull, wcstouq) |