[4.1] 17fbc57 Make NEEDLESS_RETURN part of vdef.h

[Poul-Henning Kamp]

commit 17fbc579e3409fc6be3d8a7f79caa0d3b5076abb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Jul 11 20:16:58 2015 +0000

    Make NEEDLESS_RETURN part of vdef.h

diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index a97986c..7b2c371 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -103,8 +103,6 @@ void mgt_child_inherit(int fd, const char *what);
 		exit(2);					\
 	} while (0)
 
-#define NEEDLESS_RETURN(foo)	return (foo)
-
 /* cache/cache_vcl.c */
 int VCL_TestLoad(const char *);
 
diff --git a/include/vdef.h b/include/vdef.h
index 5d52ddb..f6592b3 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -78,5 +78,6 @@
  */
 #define __match_proto__(xxx)		/*lint -e{818} */
 
+#define NEEDLESS_RETURN(foo)	return (foo)
 
 #endif /* VDEF_H_INCLUDED */
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index e662bee..989ee0a 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -51,8 +51,6 @@
 #include "vsl_api.h"
 #include "vxp.h"
 
-#define NEEDLESS_RETURN(foo) return(foo)
-
 struct vslq_query {
 	unsigned		magic;
 #define VSLQ_QUERY_MAGIC	0x122322A5