vdef: Centralize __has_feature(...) fallback

5891cb0b · Dridi Boukelmoune · 0e7fe4a9 · 5891cb0b · 5891cb0b · 5891cb0b
Commit 5891cb0b authored Apr 15, 2021 by Dridi Boukelmoune
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

mgt_param.c bin/varnishd/mgt/mgt_param.c +0 -4

vdef.h include/vdef.h +4 -0

vbh.c lib/libvarnish/vbh.c +0 -4

No files found.
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -45,10 +45,6 @@
 #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

--- a/include/vdef.h
+++ b/include/vdef.h
@@ -79,6 +79,10 @@
 		*(fdp) = -1;			\
 	} while (0)

+#if !defined(__has_feature)
+#  define __has_feature(x)	0
+#endif
+
 #ifndef __GNUC_PREREQ__
 # if defined __GNUC__ && defined __GNUC_MINOR__
 #  define __GNUC_PREREQ__(maj, min) \

--- a/lib/libvarnish/vbh.c
+++ b/lib/libvarnish/vbh.c
@@ -48,10 +48,6 @@
 #include "vas.h"
 #include "vbh.h"

-#if !defined(__has_feature)
-#define __has_feature(x)	0
-#endif
-
 /* Parameters --------------------------------------------------------*/

 /*