Merge branch 'ef/msys-imap'

diff --git a/imap-send.c b/imap-send.c
index 69e614245681e86c56a50cd096a675e8dc96deec..6c9938a0757a3c3b440c227951462f6972923afe 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -271,8 +271,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
 #ifdef NO_OPENSSL
        fprintf(stderr, "SSL requested but SSL support not compiled in\n");
        return -1;
+#else
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+       const SSL_METHOD *meth;
 #else
        SSL_METHOD *meth;
+#endif
        SSL_CTX *ctx;
        int ret;