projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: remove doubled words in comments, e.g., s/a a/a/
[gnulib.git]
/
lib
/
c-strtod.c
diff --git
a/lib/c-strtod.c
b/lib/c-strtod.c
index
9723e0b
..
5b39b9b
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, 2006, 2009
Free Software Foundation, Inc.
+ Copyright (C) 2003
-2004, 2006, 2009-2011
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
@@
-43,7
+43,7
@@
# define STRTOD strtod
#endif
# define STRTOD strtod
#endif
-#if
def LC_ALL_MASK
+#if
defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
/* Cache for the C locale object.
Marked volatile so that different threads see the same value
/* Cache for the C locale object.
Marked volatile so that different threads see the same value
@@
-67,13
+67,13
@@
C_STRTOD (char const *nptr, char **endptr)
{
DOUBLE r;
{
DOUBLE r;
-#if
def LC_ALL_MASK
+#if
defined LC_ALL_MASK && (LONG ? HAVE_STRTOLD_L : HAVE_STRTOD_L)
locale_t locale = c_locale ();
if (!locale)
{
if (endptr)
locale_t locale = c_locale ();
if (!locale)
{
if (endptr)
-
*endptr =
nptr;
+
*endptr = (char *)
nptr;
return 0; /* errno is set here */
}
return 0; /* errno is set here */
}
@@
-87,11
+87,11
@@
C_STRTOD (char const *nptr, char **endptr)
{
saved_locale = strdup (saved_locale);
if (saved_locale == NULL)
{
saved_locale = strdup (saved_locale);
if (saved_locale == NULL)
- {
- if (endptr)
-
*endptr =
nptr;
- return 0; /* errno is set here */
- }
+
{
+
if (endptr)
+
*endptr = (char *)
nptr;
+
return 0; /* errno is set here */
+
}
setlocale (LC_NUMERIC, "C");
}
setlocale (LC_NUMERIC, "C");
}