[master] 184736fad Workaround build issue in macos

Federico G. Schwindt fgsch at lodoss.net
Wed Nov 25 13:11:07 UTC 2020


commit 184736fad473070da79b77a16eab38faf393516e
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Nov 25 11:06:51 2020 +0000

    Workaround build issue in macos
    
    stdbool.h gets pulled in indirectly, which defines bool to _Bool.
    Since we are not using the bool type here, just undefine it.

diff --git a/bin/varnishd/common/common_param.h b/bin/varnishd/common/common_param.h
index e11967a2a..b7f07ace3 100644
--- a/bin/varnishd/common/common_param.h
+++ b/bin/varnishd/common/common_param.h
@@ -40,6 +40,10 @@
 
 #define VSM_CLASS_PARAM		"Params"
 
+#ifdef __MACH__
+#undef bool
+#endif
+
 enum debug_bits {
 #define DEBUG_BIT(U, l, d) DBG_##U,
 #include "tbl/debug_bits.h"


More information about the varnish-commit mailing list