[6.0] 998d7b2e5 Rework to make gcc happy

Federico G. Schwindt fgsch at lodoss.net
Thu Aug 16 08:52:30 UTC 2018


commit 998d7b2e5078b8ac7e68727b78a92dd4aa342535
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sat Mar 31 11:27:28 2018 -0300

    Rework to make gcc happy

diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 0797bfcfe..139814c09 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -43,6 +43,10 @@
 #include "vav.h"
 #include "vcli_serve.h"
 
+#if !defined(__has_feature)
+#define __has_feature(x)	0
+#endif
+
 struct plist {
 	unsigned			magic;
 #define PLIST_MAGIC			0xbfc3ea16
@@ -510,8 +514,7 @@ MCF_InitParams(struct cli *cli)
 	low = sysconf(_SC_THREAD_STACK_MIN);
 	MCF_ParamConf(MCF_MINIMUM, "thread_pool_stack", "%jdb", (intmax_t)low);
 
-#if defined(__SANITIZER) || \
-    (defined(__has_feature) && __has_feature(address_sanitizer))
+#if defined(__SANITIZER) || __has_feature(address_sanitizer)
 	def = 92 * 1024;
 #else
 	def = 48 * 1024;


More information about the varnish-commit mailing list