diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-04-16 14:54:27 -0700 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-04-16 14:54:27 -0700 |
commit | e10c2d6ab9e3ee5ebeca76a34dd93d624b579da1 (patch) | |
tree | 2a0216a274628659694e875dd03ffe65ab5344ad /Python/pystrtod.c | |
parent | 52fdbac919f35a276a2924a1dfe8b71c2b497db2 (diff) | |
parent | 88a7179f982d5982844e7e57c303c2df1f5e7854 (diff) | |
download | cpython-e10c2d6ab9e3ee5ebeca76a34dd93d624b579da1.tar.gz |
merge 3.5 (#26659)
Diffstat (limited to 'Python/pystrtod.c')
-rw-r--r-- | Python/pystrtod.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Python/pystrtod.c b/Python/pystrtod.c index 209c9086c8..5f3af92dca 100644 --- a/Python/pystrtod.c +++ b/Python/pystrtod.c @@ -881,12 +881,12 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val, #define OFS_E 2 /* The lengths of these are known to the code below, so don't change them */ -static char *lc_float_strings[] = { +static const char * const lc_float_strings[] = { "inf", "nan", "e", }; -static char *uc_float_strings[] = { +static const char * const uc_float_strings[] = { "INF", "NAN", "E", @@ -925,7 +925,8 @@ static char * format_float_short(double d, char format_code, int mode, int precision, int always_add_sign, int add_dot_0_if_integer, - int use_alt_formatting, char **float_strings, int *type) + int use_alt_formatting, const char * const *float_strings, + int *type) { char *buf = NULL; char *p = NULL; @@ -1176,7 +1177,7 @@ PyAPI_FUNC(char *) PyOS_double_to_string(double val, int flags, int *type) { - char **float_strings = lc_float_strings; + const char * const *float_strings = lc_float_strings; int mode; /* Validate format_code, and map upper and lower case. Compute the |