Merged revisions 80540 via svnmerge from

pitrou · pitrou · commit 06e34a9476f7 · 2010-04-27T19:14:15.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80540 | antoine.pitrou | 2010-04-27 21:09:59 +0200 (mar., 27 avril 2010) | 4 lines Issue #8549: Fix compiling the _ssl extension under AIX. Patch by Sridhar Ratnakumar. ........
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -623,6 +623,7 @@ Anders Qvist
 Burton Radons
 Brodie Rao
 Antti Rasinen
+Sridhar Ratnakumar
 Eric Raymond
 Edward K. Ream
 Chris Rebert
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -339,6 +339,9 @@ C-API
 Library
 -------
 
+- Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
+  Sridhar Ratnakumar.
+
 - Issue #6656: fix locale.format_string to handle escaped percents
   and mappings.
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -66,7 +66,7 @@ enum py_ssl_version {
 	PY_SSL_VERSION_SSL2,
 	PY_SSL_VERSION_SSL3,
 	PY_SSL_VERSION_SSL23,
-	PY_SSL_VERSION_TLS1,
+	PY_SSL_VERSION_TLS1
 };
 
 /* Include symbols from _socket module */
