diff options
author | Benjamin Peterson <benjamin@python.org> | 2017-01-31 23:31:20 -0800 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2017-01-31 23:31:20 -0800 |
commit | 75a56cd1847142d9c893b6df5fb674f54b34d9ed (patch) | |
tree | 73d254a7d8ed4bc2f76293a2b2e223c3f48e7dd4 /Objects/floatobject.c | |
parent | bff21dc9e43eaf9549abe72a32d98a6c20de8c5b (diff) | |
parent | fcd15724f28a5249f13690af32dc12628ab186c6 (diff) | |
download | cpython-75a56cd1847142d9c893b6df5fb674f54b34d9ed.tar.gz |
merge 3.6 (#29398)
Diffstat (limited to 'Objects/floatobject.c')
-rw-r--r-- | Objects/floatobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 80bf71efd2..17a55dd114 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1225,7 +1225,7 @@ float_fromhex(PyObject *cls, PyObject *arg) PyObject *result; double x; long exp, top_exp, lsb, key_digit; - char *s, *coeff_start, *s_store, *coeff_end, *exp_start, *s_end; + const char *s, *coeff_start, *s_store, *coeff_end, *exp_start, *s_end; int half_eps, digit, round_up, negate=0; Py_ssize_t length, ndigits, fdigits, i; @@ -1288,7 +1288,7 @@ float_fromhex(PyObject *cls, PyObject *arg) s++; /* infinities and nans */ - x = _Py_parse_inf_or_nan(s, &coeff_end); + x = _Py_parse_inf_or_nan(s, (char **)&coeff_end); if (coeff_end != s) { s = coeff_end; goto finished; @@ -1619,7 +1619,7 @@ static float_format_type detected_double_format, detected_float_format; static PyObject * float_getformat(PyTypeObject *v, PyObject* arg) { - char* s; + const char *s; float_format_type r; if (!PyUnicode_Check(arg)) { |