Commit 6e676954 authored by Victor Stinner's avatar Victor Stinner Committed by GitHub

timemodule.c: Cast PyUnicode_AsUTF8() to char* (#1294)

bpo-28769 changed PyUnicode_AsUTF8() return type from const char* to
char* in Python 3.7, but tm_zone field type of the tm structure is
char* on FreeBSD.

Cast PyUnicode_AsUTF8() to char* in gettmarg() to fix the warning:

    Modules/timemodule.c:443:20: warning: assigning to 'char *'
    from 'const char *' discards qualifiers
parent 87c07fe9
......@@ -440,7 +440,7 @@ gettmarg(PyObject *args, struct tm *p)
if (Py_TYPE(args) == &StructTimeType) {
PyObject *item;
item = PyTuple_GET_ITEM(args, 9);
p->tm_zone = item == Py_None ? NULL : PyUnicode_AsUTF8(item);
p->tm_zone = item == Py_None ? NULL : (char*)PyUnicode_AsUTF8(item);
item = PyTuple_GET_ITEM(args, 10);
p->tm_gmtoff = item == Py_None ? 0 : PyLong_AsLong(item);
if (PyErr_Occurred())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment