diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/strtold_l.c | 36 | ||||
| -rw-r--r-- | sysdeps/sparc/fpu/bits/mathinline.h | 6 |
2 files changed, 31 insertions, 11 deletions
diff --git a/sysdeps/generic/strtold_l.c b/sysdeps/generic/strtold_l.c index e43654700f..690a8a92eb 100644 --- a/sysdeps/generic/strtold_l.c +++ b/sysdeps/generic/strtold_l.c @@ -20,21 +20,39 @@ #include <stdlib.h> #include <xlocale.h> - -extern double ____strtod_l_internal (const char *, char **, int, __locale_t); - +#ifdef USE_WIDE_CHAR +# define STRING_TYPE wchar_t +# define STRTOLD wcstold_l +# define __STRTOLD __wcstold_l +# define __STRTOD __wcstod_l +#else +# define STRING_TYPE char +# define STRTOLD strtold_l +# define __STRTOLD __strtold_l +# define __STRTOD __strtod_l +#endif + +#define INTERNAL(x) INTERNAL1(x) +#define INTERNAL1(x) __##x##_internal + +extern double INTERNAL (__STRTOD) (const STRING_TYPE *, STRING_TYPE **, + int, __locale_t); /* There is no `long double' type, use the `double' implementations. */ long double -____strtold_l_internal (const char *nptr, char **endptr, int group, - __locale_t loc) +INTERNAL (__STRTOLD) (const STRING_TYPE *nptr, STRING_TYPE **endptr, + int group, __locale_t loc) { - return ____strtod_l_internal (nptr, endptr, group, loc); + return INTERNAL (__STRTOD) (nptr, endptr, group, loc); } - +#ifndef USE_WIDE_CHAR +libc_hidden_def (INTERNAL (__STRTOLD)) +#endif long double -strtold (const char *nptr, char **endptr, __locale_t loc) +weak_function +__STRTOLD (const STRING_TYPE *nptr, STRING_TYPE **endptr, __locale_t loc) { - return ____strtod_l_internal (nptr, endptr, 0, loc); + return INTERNAL (__STRTOD) (nptr, endptr, 0, loc); } +weak_alias (__STRTOLD, STRTOLD) diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h index 734ff0590d..fcbcf41f67 100644 --- a/sysdeps/sparc/fpu/bits/mathinline.h +++ b/sysdeps/sparc/fpu/bits/mathinline.h @@ -1,5 +1,5 @@ /* Inline math functions for SPARC. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>. @@ -24,7 +24,9 @@ #include <bits/wordsize.h> -#if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) +#ifdef __GNUC__ + +#if defined __USE_ISOC99 && !__GNUC_PREREQ(3,0) # undef isgreater # undef isgreaterequal # undef isless |