From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 26 Apr 2017 11:51:48 +0000 (+0200)
Subject: timemodule.c: Cast PyUnicode_AsUTF8() to char* (#1294)
X-Git-Tag: v3.7.0a1~899
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e676954de7c4f3f06dd5b56842c9a2c931a1cab;p=thirdparty%2FPython%2Fcpython.git

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
---

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 32062a3a6a7f..15c467b9b407 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -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())