X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fc-strtod.c;h=95624ccc1ebb726a7ad110f4c734bbfd97d3e1af;hb=28d9a006c64dcc3e831f8a5149eed0739a89df12;hp=c9ebb8091b9c91c1b767d7f171ef257bd8dbc17a;hpb=8cebd8c7494b94d0466e115bb76df80499bd99b2;p=gnulib.git
diff --git a/lib/c-strtod.c b/lib/c-strtod.c
index c9ebb8091..95624ccc1 100644
--- a/lib/c-strtod.c
+++ b/lib/c-strtod.c
@@ -1,11 +1,11 @@
/* Convert string to double, using the C locale.
- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,14 +13,11 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "c-strtod.h"
@@ -39,8 +36,8 @@
# define STRTOD_L strtod_l
#endif
-/* c_strtold falls back on strtod if strtold isn't declared. */
-#if LONG && HAVE_DECL_STRTOLD
+/* c_strtold falls back on strtod if strtold doesn't conform to C99. */
+#if LONG && HAVE_C99_STRTOLD
# define STRTOD strtold
#else
# define STRTOD strtod
@@ -59,19 +56,19 @@ C_STRTOD (char const *nptr, char **endptr)
#else
- char *saved_locale = setlocale (LC_ALL, NULL);
+ char *saved_locale = setlocale (LC_NUMERIC, NULL);
if (saved_locale)
{
saved_locale = xstrdup (saved_locale);
- setlocale (LC_ALL, "C");
+ setlocale (LC_NUMERIC, "C");
}
r = STRTOD (nptr, endptr);
if (saved_locale)
{
- setlocale (LC_ALL, saved_locale);
+ setlocale (LC_NUMERIC, saved_locale);
free (saved_locale);
}