From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 27 Jan 2022 17:23:16 +0000 (-0600)
Subject: Fix ODR violation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c5c66db33e1ef9f8231efa681f97f949b8a20c;p=thirdparty%2Ffreeradius-server.git

Fix ODR violation
---

diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 931e19c791..4857f9b28a 100644
--- 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 73641589ee..43c5f1f79c 100644
--- 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
  *