diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-27 12:50:12 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-27 12:50:12 +0000 |
commit | f470196a4144dd586f8b80efeef4aca39cf11514 (patch) | |
tree | 82fb31007e47f4eb2a31e8bb7bb9e6229a40dc36 /sysklogd/syslogd.c | |
parent | 61160dd0a155364d30b7009b69e2a15afa651a2c (diff) | |
download | busybox-w32-f470196a4144dd586f8b80efeef4aca39cf11514.tar.gz busybox-w32-f470196a4144dd586f8b80efeef4aca39cf11514.tar.bz2 busybox-w32-f470196a4144dd586f8b80efeef4aca39cf11514.zip |
- fix conflicting decls of syslog related facilitynames and prioritynames tables
Diffstat (limited to 'sysklogd/syslogd.c')
-rw-r--r-- | sysklogd/syslogd.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "libbb.h" | 16 | #include "libbb.h" |
17 | #define SYSLOG_NAMES | ||
18 | #define SYSLOG_NAMES_CONST | ||
19 | #include <syslog.h> | ||
20 | |||
17 | #include <paths.h> | 21 | #include <paths.h> |
18 | #include <sys/un.h> | 22 | #include <sys/un.h> |
19 | |||
20 | /* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[] | ||
21 | * from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */ | ||
22 | #define SYSLOG_NAMES | ||
23 | #define SYSLOG_NAMES_CONST /* uclibc is saner :) */ | ||
24 | #include <sys/syslog.h> | ||
25 | #include <sys/uio.h> | 23 | #include <sys/uio.h> |
26 | 24 | ||
27 | #if ENABLE_FEATURE_REMOTE_LOG | 25 | #if ENABLE_FEATURE_REMOTE_LOG |