diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:27 -0800 |
| commit | 3e606ea7ca432c084677ecd52d64650cceef2e77 (patch) | |
| tree | c57b263d07a1a93ac9b7b4864285a1dafaf1538c | |
| parent | 8d324bf89057a28fda08cc4c8d37ce98a79cf9be (diff) | |
| parent | 1e380ddcd29f1e25bfb58b7068fdafb038c8dd9a (diff) | |
| download | git-3e606ea7ca432c084677ecd52d64650cceef2e77.tar.gz git-3e606ea7ca432c084677ecd52d64650cceef2e77.tar.xz | |
Merge branch 'vl/maint-openssl-signature-change' into maint
* vl/maint-openssl-signature-change:
imap-send.c: fix compiler warnings for OpenSSL 1.0
| -rw-r--r-- | imap-send.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/imap-send.c b/imap-send.c index 3847fd151..f805c6ed8 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; |