summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:18 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:32:18 -0800
commit740b6ad75bbe0cd0c3f4be30f0380814878ac445 (patch)
tree8f0e6726178c2d6ffc9cbadc204a034b892fb464
parent7b2ac7ee9ec19b8f9302a776b7274faee66e9b64 (diff)
parent1e380ddcd29f1e25bfb58b7068fdafb038c8dd9a (diff)
downloadgit-740b6ad75bbe0cd0c3f4be30f0380814878ac445.tar.gz
Merge branch 'vl/maint-openssl-signature-change'
* vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0
-rw-r--r--imap-send.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/imap-send.c b/imap-send.c
index 3847fd151d..f805c6ed81 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -273,7 +273,11 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
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;