diff options
author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Modules/_ctypes/stgdict.c | |
parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Modules/_ctypes/stgdict.c')
-rw-r--r-- | Modules/_ctypes/stgdict.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c index 716d1e9e8e..1ccaf2fd9b 100644 --- a/Modules/_ctypes/stgdict.c +++ b/Modules/_ctypes/stgdict.c @@ -228,7 +228,7 @@ MakeFields(PyObject *type, CFieldObject *descr, } continue; } - new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type, NULL); + new_descr = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type); if (new_descr == NULL) { Py_DECREF(fdescr); Py_DECREF(fieldlist); @@ -488,8 +488,8 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct bitsize = 0; if (isStruct && !isPacked) { - char *fieldfmt = dict->format ? dict->format : "B"; - char *fieldname = PyUnicode_AsUTF8(name); + const char *fieldfmt = dict->format ? dict->format : "B"; + const char *fieldname = PyUnicode_AsUTF8(name); char *ptr; Py_ssize_t len; char *buf; |