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 /loginutils | |
parent | 61160dd0a155364d30b7009b69e2a15afa651a2c (diff) | |
download | busybox-f470196a4144dd586f8b80efeef4aca39cf11514.tar.gz |
- fix conflicting decls of syslog related facilitynames and prioritynames tables
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/login.c | 2 | ||||
-rw-r--r-- | loginutils/passwd.c | 1 | ||||
-rw-r--r-- | loginutils/sulogin.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/loginutils/login.c b/loginutils/login.c index 7e9044654..55cbfa7cd 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -4,9 +4,9 @@ */ #include "libbb.h" +#include <syslog.h> #include <utmp.h> #include <sys/resource.h> -#include <syslog.h> #if ENABLE_SELINUX #include <selinux/selinux.h> /* for is_selinux_enabled() */ diff --git a/loginutils/passwd.c b/loginutils/passwd.c index 0842b71bf..0df084e5a 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -6,7 +6,6 @@ #include "libbb.h" #include <syslog.h> - static void nuke_str(char *str) { if (str) memset(str, 0, strlen(str)); diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index af457ef1e..faa93eaea 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -5,9 +5,8 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <syslog.h> - #include "libbb.h" +#include <syslog.h> //static void catchalarm(int ATTRIBUTE_UNUSED junk) //{ |