Attempt merging from 6.3.24.

[~andy/fetchmail] / tls.c

diff --git a/tls.c b/tls.c
index 1ff2664fe5a852aa8e9304dc4294f7b6dff6b5f6..62539f91f24ff4f452e2674e3b778da22df1867f 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -5,9 +5,7 @@
 
 #include "fetchmail.h"
 
-#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif
 
 /** return true if user allowed TLS */
 int maybe_tls(struct query *ctl) {
@@ -16,6 +14,7 @@ int maybe_tls(struct query *ctl) {
     return (!ctl->sslproto || !strcasecmp(ctl->sslproto,"tls1"))
        && !ctl->use_ssl;
 #else
+    (void)ctl;
     return 0;
 #endif
 }
@@ -28,6 +27,7 @@ int must_tls(struct query *ctl) {
        && (ctl->sslfingerprint || ctl->sslcertck
                || (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1")));
 #else
+    (void)ctl;
     return 0;
 #endif
 }