diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-05 22:29:29 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-05 22:29:29 -0400 |
| commit | d08cbb8120aa7924107361ab12345b5e70628d6b (patch) | |
| tree | db6e4659ba18fd06ac6345102409f5553a38a8f4 /Python/modsupport.c | |
| parent | 4efdf5d86b0f3d597b8027c724090d9e3bcfbcab (diff) | |
| parent | bf7ed725f5a3ba7f168dfbe5500a8949a97f917b (diff) | |
| download | cpython-d08cbb8120aa7924107361ab12345b5e70628d6b.tar.gz | |
Issue #27960: Merge with 3.5
Diffstat (limited to 'Python/modsupport.c')
| -rw-r--r-- | Python/modsupport.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c index 0d093711f5..4911f06e44 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -260,13 +260,12 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) return PyLong_FromUnsignedLong(n); } -#ifdef HAVE_LONG_LONG case 'L': return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG)); case 'K': return PyLong_FromUnsignedLongLong((PY_LONG_LONG)va_arg(*p_va, unsigned PY_LONG_LONG)); -#endif + case 'u': { PyObject *v; @@ -318,7 +317,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) case 'U': /* XXX deprecated alias */ { PyObject *v; - char *str = va_arg(*p_va, char *); + const char *str = va_arg(*p_va, const char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; @@ -351,7 +350,7 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) case 'y': { PyObject *v; - char *str = va_arg(*p_va, char *); + const char *str = va_arg(*p_va, const char *); Py_ssize_t n; if (**p_format == '#') { ++*p_format; |