BUILD: tcpcheck: do not declare tcp_check_keywords_register() inline

This one is referenced in initcalls by its pointer, it makes no sense
to declare it inline. At best it causes function duplication, at worst
it doesn't build on older compilers.

diff --git a/include/haproxy/tcpcheck.h b/include/haproxy/tcpcheck.h
index 0d92983c4245e1f6adf861ad1778f18f4e950eae..3abd1ef07477f239b3b15b76990eb04076a4c7dd 100644 (file)
--- a/include/haproxy/tcpcheck.h
+++ b/include/haproxy/tcpcheck.h
@@ -102,6 +102,7 @@ int proxy_parse_spop_check_opt(char **args, int cur_arg, struct proxy *curpx, co
 int proxy_parse_httpchk_opt(char **args, int cur_arg, struct proxy *curpx, const struct proxy *defpx,
                            const char *file, int line);
 
+void tcp_check_keywords_register(struct action_kw_list *kw_list);
 
 /* Return the struct action_kw associated to a keyword */
 static inline struct action_kw *action_kw_tcp_check_lookup(const char *kw)
@@ -114,11 +115,6 @@ static inline void action_kw_tcp_check_build_list(struct buffer *chk)
        action_build_list(&tcp_check_keywords.list, chk);
 }
 
-static inline void tcp_check_keywords_register(struct action_kw_list *kw_list)
-{
-       LIST_APPEND(&tcp_check_keywords.list, &kw_list->list);
-}
-
 #endif /* _HAPROXY_TCPCHECK_H */
 
 /*

diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index ff1c32b5a9c91c9aa36bfd96cedd7fdfc3c21e5b..ba9321eb18e7f2897f977994e277f799e8c76310 100644 (file)
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -2316,6 +2316,10 @@ int tcpcheck_main(struct check *check)
        return retcode;
 }
 
+void tcp_check_keywords_register(struct action_kw_list *kw_list)
+{
+       LIST_APPEND(&tcp_check_keywords.list, &kw_list->list);
+}
 
 /**************************************************************************/
 /******************* Internals to parse tcp-check rules *******************/