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

---
 sysklogd/syslogd.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'sysklogd/syslogd.c')

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 345bf0e87..de8aa04a8 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -14,14 +14,12 @@
  */
 
 #include "libbb.h"
+#define SYSLOG_NAMES
+#define SYSLOG_NAMES_CONST
+#include <syslog.h>
+
 #include <paths.h>
 #include <sys/un.h>
-
-/* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[]
- * from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */
-#define SYSLOG_NAMES
-#define SYSLOG_NAMES_CONST /* uclibc is saner :) */
-#include <sys/syslog.h>
 #include <sys/uio.h>
 
 #if ENABLE_FEATURE_REMOTE_LOG
-- 
cgit v1.2.3