aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-28 14:28:07 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-28 14:28:07 +0000
commit76235ed48f5bc3ec639e886633fc45bede1c470b (patch)
treefea71a7be41602645e2139d0552bb2378a2069fe /wcsmbs
parentdb276fa11c8a8b574f3467680a3372504629c114 (diff)
downloadglibc-76235ed48f5bc3ec639e886633fc45bede1c470b.zip
glibc-76235ed48f5bc3ec639e886633fc45bede1c470b.tar.gz
glibc-76235ed48f5bc3ec639e886633fc45bede1c470b.tar.bz2
Update.
1998-12-28 Ulrich Drepper <drepper@cygnus.com> * stdlib/fpioconst.c: If __NO_LONG_DOUBLE_MATH don't define constants beyond range of double. * stdlib/fpioconst.h (_fpioconst_pow10): Reduce size according to fpioconst.c change. * stdlib/strtold.c: Fall back on double functions if __NO_LONG_DOUBLE_MATH. * stdlib/strtold_l.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcstold_l.c: Likewise. * sysdeps/ieee754/ldbl2mpn.c: Don't generate code if __NO_LONG_DOUBLE_MATH. * sysdeps/ieee754/mpn2ldbl.c: Likewise. 1998-12-28 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/bits/endian.h: Use #warning, not #error, if the endianness can't be determined, for makedepend.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/wcstold.c42
-rw-r--r--wcsmbs/wcstold_l.c22
2 files changed, 49 insertions, 15 deletions
diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c
index fc8c010..89e8de8 100644
--- a/wcsmbs/wcstold.c
+++ b/wcsmbs/wcstold.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
@@ -17,21 +17,23 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <math.h>
+#ifndef __NO_LONG_DOUBLE_MATH
/* The actual implementation for all floating point sizes is in strtod.c.
These macros tell it to produce the `long double' version, `wcstold'. */
-#define FLOAT long double
-#define FLT LDBL
-#ifdef USE_IN_EXTENDED_LOCALE_MODEL
-# define STRTOF __wcstold_l
-#else
-# define STRTOF wcstold
-#endif
-#define MPN2FLOAT __mpn_construct_long_double
-#define FLOAT_HUGE_VAL HUGE_VALL
-#define USE_WIDE_CHAR 1
-#define SET_MANTISSA(flt, mant) \
+# define FLOAT long double
+# define FLT LDBL
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# define STRTOF __wcstold_l
+# else
+# define STRTOF wcstold
+# endif
+# define MPN2FLOAT __mpn_construct_long_double
+# define FLOAT_HUGE_VAL HUGE_VALL
+# define USE_WIDE_CHAR 1
+# define SET_MANTISSA(flt, mant) \
do { union ieee854_long_double u; \
u.d = (flt); \
if ((mant & 0x7fffffffffffffffULL) == 0) \
@@ -41,4 +43,18 @@
(flt) = u.d; \
} while (0)
-#include <stdlib/strtod.c>
+# include <stdlib/strtod.c>
+#else
+/* There is no `long double' type, use the `double' implementations. */
+long double
+__wcstold_internal (const wchar_t *nptr, wchar_t **endptr, int group)
+{
+ return __wcstod_internal (nptr, endptr, group);
+}
+
+long double
+wcstold (const wchar_t *nptr, wchar_t **endptr)
+{
+ return __wcstod_internal (nptr, endptr, 0);
+}
+#endif
diff --git a/wcsmbs/wcstold_l.c b/wcsmbs/wcstold_l.c
index f92ec78..8f62725 100644
--- a/wcsmbs/wcstold_l.c
+++ b/wcsmbs/wcstold_l.c
@@ -19,10 +19,13 @@
Boston, MA 02111-1307, USA. */
#define __need_wchar_t
+#include <math.h>
#include <stddef.h>
#include <locale.h>
-#define USE_IN_EXTENDED_LOCALE_MODEL 1
+#ifndef __NO_LONG_DOUBLE_MATH
+
+# define USE_IN_EXTENDED_LOCALE_MODEL 1
extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **, int,
__locale_t);
@@ -30,4 +33,19 @@ extern unsigned long long int ____wcstoull_l_internal (const wchar_t *,
wchar_t **, int, int,
__locale_t);
-#include <wcstold.c>
+# include <wcstold.c>
+#else
+/* There is no `long double' type, use the `double' implementations. */
+long double
+____wcstold_l_internal (const wchar_t *nptr, wchar_t **endptr, int group,
+ __locale_t loc)
+{
+ return ____wcstod_l_internal (nptr, endptr, group, loc);
+}
+
+long double
+__wcstold_l (const wchar_t *nptr, wchar_t **endptr, __locale_t loc)
+{
+ return __wcstod_internal (nptr, endptr, 0, loc);
+}
+#endif