From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 13 Oct 2010 22:10:31 +0000 (+0000)
Subject: Merged revisions 85432 via svnmerge from
X-Git-Tag: v2.7.1rc1~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e73403284b1c2a1e38ec63986e30b7080058cdb;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 85432 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85432 | benjamin.peterson | 2010-10-13 17:06:39 -0500 (Wed, 13 Oct 2010) | 1 line

  constify to appease compiler warnings
........
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 1131bfa73802..5595c1587dd9 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -680,7 +680,7 @@ _get_peer_alt_names (X509 *certificate) {
     X509_EXTENSION *ext = NULL;
     GENERAL_NAMES *names = NULL;
     GENERAL_NAME *name;
-    X509V3_EXT_METHOD *method;
+    const X509V3_EXT_METHOD *method;
     BIO *biobuf = NULL;
     char buf[2048];
     char *vptr;
@@ -1041,7 +1041,7 @@ return the certificate even if it wasn't validated.");
 static PyObject *PySSL_cipher (PySSLObject *self) {
 
     PyObject *retval, *v;
-    SSL_CIPHER *current;
+    const SSL_CIPHER *current;
     char *cipher_name;
     char *cipher_protocol;