Fix ODR violation

diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 931e19c79184712e147d2ef62a6ec364d0b9eea1..4857f9b28acd479a1514857e7739e56fe91af582 100644 (file)
--- a/src/lib/server/trunk.c
+++ b/src/lib/server/trunk.c
@@ -301,6 +301,9 @@ static CONF_PARSER const fr_trunk_config_connection[] = {
        CONF_PARSER_TERMINATOR
 };
 
+#ifdef TRUNK_TESTS     /* Don't export this from the trunk tests binary */
+static
+#endif
 CONF_PARSER const fr_trunk_config[] = {
        { FR_CONF_OFFSET("start", FR_TYPE_UINT16, fr_trunk_conf_t, start), .dflt = "5" },
        { FR_CONF_OFFSET("min", FR_TYPE_UINT16, fr_trunk_conf_t, min), .dflt = "1" },

diff --git a/src/lib/server/trunk.h b/src/lib/server/trunk.h
index 73641589ee9f0131abde3ad9c9df9602d8e140e9..43c5f1f79c698d853431c844781412a4f827fce8 100644 (file)
--- a/src/lib/server/trunk.h
+++ b/src/lib/server/trunk.h
@@ -341,10 +341,12 @@ struct fr_trunk_connection_pub_s {
        fr_trunk_t              * _CONST trunk;         //!< Trunk this connection belongs to.
 };
 
+#ifndef TRUNK_TESTS
 /** Config parser definitions to populate a fr_trunk_conf_t
  *
  */
 extern CONF_PARSER const fr_trunk_config[];
+#endif
 
 /** Allocate a new connection for the trunk
  *