[master] 6b717fb Make __match_proto__() macro globally visible

Poul-Henning Kamp phk at varnish-cache.org
Sat Jun 29 13:12:10 CEST 2013


commit 6b717fb150b3343df96b8ca5a67e7912b3db0d26
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Jun 29 11:09:37 2013 +0000

    Make __match_proto__() macro globally visible

diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index 978b54d..43af1c3 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -57,13 +57,6 @@ struct cli;
  */
 
 /*
- * In OO-light situations, functions have to match their prototype
- * even if that means not const'ing a const'able argument.
- * The typedef should be specified as argument to the macro.
- */
-#define __match_proto__(xxx)		/*lint -e{818} */
-
-/*
  * State variables may change value before we use the last value we
  * set them to.
  * Pass no argument.
diff --git a/include/vdef.h b/include/vdef.h
index 9beedb0..89694b2 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -67,4 +67,16 @@
 # endif
 #endif
 
+/**********************************************************************
+ * FlexeLint and compiler shutuppery
+ */
+
+/*
+ * In OO-light situations, functions have to match their prototype
+ * even if that means not const'ing a const'able argument.
+ * The typedef should be specified as argument to the macro.
+ */
+#define __match_proto__(xxx)		/*lint -e{818} */
+
+
 #endif /* VDEF_H_INCLUDED */



More information about the varnish-commit mailing list