From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 8 Mar 2020 19:21:05 +0000 (+0100)
Subject: ldpd: remove multiple definitions of thread_master
X-Git-Tag: frr-7.3.1~8^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3340b7c6f4910cca7709d4fe741534b1c2ccebca;p=mirror%2Ffrr.git

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 006d27f6ab..5f94031320 100644
--- 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 3a964c0caa..82e52f5fe3 100644
--- 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 [] =
 {