projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
c-strtod.c
diff --git
a/lib/c-strtod.c
b/lib/c-strtod.c
index
c9ebb80
..
2234ed0
100644
(file)
--- a/
lib/c-strtod.c
+++ b/
lib/c-strtod.c
@@
-1,6
+1,6
@@
/* Convert string to double, using the C locale.
/* 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
it under the terms of the GNU General Public License as published by
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
@@
-14,13
+14,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "c-strtod.h"
#include "c-strtod.h"
@@
-39,8
+37,8
@@
# define STRTOD_L strtod_l
#endif
# 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
# define STRTOD strtold
#else
# define STRTOD strtod
@@
-59,19
+57,19
@@
C_STRTOD (char const *nptr, char **endptr)
#else
#else
- char *saved_locale = setlocale (LC_
ALL
, NULL);
+ char *saved_locale = setlocale (LC_
NUMERIC
, NULL);
if (saved_locale)
{
saved_locale = xstrdup (saved_locale);
if (saved_locale)
{
saved_locale = xstrdup (saved_locale);
- setlocale (LC_
ALL
, "C");
+ setlocale (LC_
NUMERIC
, "C");
}
r = STRTOD (nptr, endptr);
if (saved_locale)
{
}
r = STRTOD (nptr, endptr);
if (saved_locale)
{
- setlocale (LC_
ALL
, saved_locale);
+ setlocale (LC_
NUMERIC
, saved_locale);
free (saved_locale);
}
free (saved_locale);
}