ldpd: remove multiple definitions of thread_master

This fixes the last issue compiling FRR with GCC 10 on Fedora Rawhide.

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
(cherry picked from commit f3faea7fe3bf5f73991effe56290346e3f43728e)

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 006d27f6abb873fbd6a1afee0c001b1b8bc0af77..5f94031320c351d34aeb10eb4c70e33229c118f5 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -71,9 +71,6 @@ struct nbr_tree                lde_nbrs = RB_INITIALIZER(&lde_nbrs);
 static struct imsgev   *iev_ldpe;
 static struct imsgev   *iev_main, *iev_main_sync;
 
-/* Master of threads. */
-struct thread_master *master;
-
 /* lde privileges */
 static zebra_capabilities_t _caps_p [] =
 {

diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index 3a964c0caa754574b3b00cfd7d60a8efd4b4321f..82e52f5fe3f05b35a2b37838161b5e91fdea6ce8 100644 (file)
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -54,9 +54,6 @@ static struct imsgev  *iev_lde;
 static struct thread   *pfkey_ev;
 #endif
 
-/* Master of threads. */
-struct thread_master *master;
-
 /* ldpe privileges */
 static zebra_capabilities_t _caps_p [] =
 {