From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 26 Apr 2018 16:31:45 +0000 (-0400)
Subject: lib: fix clippy build w/ gcc under certain configs
X-Git-Tag: frr-5.0-dev~8^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2125%2Fhead;p=mirror%2Ffrr.git

lib: fix clippy build w/ gcc under certain configs

GCC's linker driver sometimes gets confused when building clippy.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/lib/command_graph.c b/lib/command_graph.c
index 4555d6eaeb..0e8669c4b5 100644
--- a/lib/command_graph.c
+++ b/lib/command_graph.c
@@ -25,8 +25,6 @@
 #include <zebra.h>
 
 #include "command_graph.h"
-#include "command.h"
-#include "log.h"
 
 DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens")
 DEFINE_MTYPE_STATIC(LIB, CMD_DESC, "Command Token Text")
@@ -462,6 +460,9 @@ void cmd_graph_names(struct graph *graph)
 
 #ifndef BUILDING_CLIPPY
 
+#include "command.h"
+#include "log.h"
+
 void cmd_graph_node_print_cb(struct graph_node *gn, struct buffer *buf)
 {
 	static bool wasend;