From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 25 May 2013 11:23:03 +0000 (+0200)
Subject: Fix compilation under MSVC: ssl_set_mode() is a macro, and the MSVC preprocessor... 
X-Git-Tag: v3.4.0a1~641
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19fef69b752d5a1e836ba5b552a8e68592503852;p=thirdparty%2FPython%2Fcpython.git

Fix compilation under MSVC: ssl_set_mode() is a macro, and the MSVC preprocessor doesn't process #ifdef's inside a macro argument list.

(found explanation at http://www.tech-archive.net/Archive/VC/microsoft.public.vc.language/2007-05/msg00385.html)
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index ca41bbfc691f..c64d209ec87b 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -470,6 +470,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
 {
     PySSLSocket *self;
     SSL_CTX *ctx = sslctx->ctx;
+    long mode;
 
     self = PyObject_New(PySSLSocket, &PySSLSocket_Type);
     if (self == NULL)
@@ -490,11 +491,11 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     PySSL_END_ALLOW_THREADS
     SSL_set_app_data(self->ssl,self);
     SSL_set_fd(self->ssl, sock->sock_fd);
-    SSL_set_mode(self->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
+    mode = SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
 #ifdef SSL_MODE_AUTO_RETRY
-                 | SSL_MODE_AUTO_RETRY
+    mode |= SSL_MODE_AUTO_RETRY;
 #endif
-                 );
+    SSL_set_mode(self->ssl, mode);
 
 #if HAVE_SNI
     if (server_hostname != NULL)