summaryrefslogtreecommitdiff
path: root/Python/modsupport.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-04-16 14:54:27 -0700
committerBenjamin Peterson <benjamin@python.org>2016-04-16 14:54:27 -0700
commite10c2d6ab9e3ee5ebeca76a34dd93d624b579da1 (patch)
tree2a0216a274628659694e875dd03ffe65ab5344ad /Python/modsupport.c
parent52fdbac919f35a276a2924a1dfe8b71c2b497db2 (diff)
parent88a7179f982d5982844e7e57c303c2df1f5e7854 (diff)
downloadcpython-e10c2d6ab9e3ee5ebeca76a34dd93d624b579da1.tar.gz
merge 3.5 (#26659)
Diffstat (limited to 'Python/modsupport.c')
-rw-r--r--Python/modsupport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 6c938ddd79..7e6a65b531 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -301,7 +301,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;
@@ -334,7 +334,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;