diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-01-07 21:38:51 -0800 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-01-07 21:38:51 -0800 |
commit | 44e1dea4c378cbcee7430555abbde48b15feebf3 (patch) | |
tree | 40d110d01b92c9cae8147427c9607a8f57ad12d8 /Modules/_ssl.c | |
parent | dc8e5e75a096c4a6b50f323fe827132937912eab (diff) | |
parent | 32d990d41425ab09257290419325c3f1512c7924 (diff) | |
download | cpython-44e1dea4c378cbcee7430555abbde48b15feebf3.tar.gz |
merge 3.5 (closes #25672)
Diffstat (limited to 'Modules/_ssl.c')
-rw-r--r-- | Modules/_ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1c68000b9a..529d2f0d74 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -378,7 +378,7 @@ fail: } static PyObject * -PySSL_SetError(PySSLSocket *obj, int ret, char *filename, int lineno) +PySSL_SetError(PySSLSocket *obj, int ret, const char *filename, int lineno) { PyObject *type = PySSLErrorObject; char *errstr = NULL; @@ -460,7 +460,7 @@ PySSL_SetError(PySSLSocket *obj, int ret, char *filename, int lineno) } static PyObject * -_setSSLError (char *errstr, int errcode, char *filename, int lineno) { +_setSSLError (const char *errstr, int errcode, const char *filename, int lineno) { if (errstr == NULL) errcode = ERR_peek_last_error(); |