diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-02-17 22:18:35 -0800 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-02-17 22:18:35 -0800 |
commit | 4913c9e290e633491914469ab932fb6ea15ae042 (patch) | |
tree | 6cda6345acdd5c495657cba1fade1d5958ec7f3e /Modules/_ssl.c | |
parent | 885e1b847a6324618f9c048f1cbd9909f1e9c1fd (diff) | |
parent | 597ddd5015f84a4a0ea8f97a170006f008979bf8 (diff) | |
download | cpython-4913c9e290e633491914469ab932fb6ea15ae042.tar.gz |
merge 3.5 (closes #25939)
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 3377138f61..c96237ed9d 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(); |