From f470196a4144dd586f8b80efeef4aca39cf11514 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Sun, 27 Jan 2008 12:50:12 +0000
Subject: - fix conflicting decls of syslog related facilitynames and
 prioritynames tables

---
 networking/dnsd.c              | 2 +-
 networking/isrv_identd.c       | 2 +-
 networking/libiproute/iprule.c | 1 -
 networking/telnetd.c           | 3 +--
 networking/zcip.c              | 4 +---
 5 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'networking')

diff --git a/networking/dnsd.c b/networking/dnsd.c
index 8f01d5c06..19720d6bc 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -17,8 +17,8 @@
  * the first porting of oao' scdns to busybox also.
  */
 
-#include <syslog.h>
 #include "libbb.h"
+#include <syslog.h>
 
 //#define DEBUG 1
 #define DEBUG 0
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index a93de1244..dbdecba24 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -7,8 +7,8 @@
  * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
-#include <syslog.h>
 #include "libbb.h"
+#include <syslog.h>
 #include "isrv.h"
 
 enum { TIMEOUT = 20 };
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 6b22061a7..3f9007ee9 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -16,7 +16,6 @@
  * initially integrated into busybox by Bernhard Fischer
  */
 
-#include <syslog.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 0201d2636..962e5cc7b 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -24,14 +24,13 @@
 #define DEBUG 0
 
 #include "libbb.h"
+#include <syslog.h>
 
 #if DEBUG
 #define TELCMDS
 #define TELOPTS
 #endif
 #include <arpa/telnet.h>
-#include <sys/syslog.h>
-
 
 /* Structure that describes a session */
 struct tsession {
diff --git a/networking/zcip.c b/networking/zcip.c
index ef9aa2186..6e1c0d148 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -23,9 +23,6 @@
 // - avoid silent script failures, especially under load...
 // - link status monitoring (restart on link-up; stop on link-down)
 
-#include <syslog.h>
-#include <poll.h>
-#include <sys/wait.h>
 #include <netinet/ether.h>
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -34,6 +31,7 @@
 #include <linux/sockios.h>
 
 #include "libbb.h"
+#include <syslog.h>
 
 /* We don't need more than 32 bits of the counter */
 #define MONOTONIC_US() ((unsigned)monotonic_us())
-- 
cgit v1.2.3