[4.0] 1c965a1 Fix compilation if SO_{SND, RCV}TIMEO_WORKS is not defined

Lasse Karstensen lkarsten at varnish-software.com
Mon Sep 22 16:38:23 CEST 2014


commit 1c965a1a612f3ae048241b0eccc735c0c6c079ae
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 11 16:14:12 2014 +0100

    Fix compilation if SO_{SND,RCV}TIMEO_WORKS is not defined
    
    Fixes #1567

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index bad4ed9..af86b2b 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -126,13 +126,13 @@ vca_tcp_opt_init(void)
 {
 	int n;
 	int one = 1;
-	// int zero = 0;
 	struct tcp_opt *to;
 	struct timeval tv;
 	int chg = 0;
-#ifdef HAVE_TCP_KEEP
 	int x;
-#endif
+
+	(void)tv;
+	(void)x;
 
 	for (n = 0; n < n_tcp_opts; n++) {
 		to = &tcp_opts[n];



More information about the varnish-commit mailing list