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-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 '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 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "libbb.h" | 6 | #include "libbb.h" |
7 | #include <syslog.h> | ||
7 | #include <utmp.h> | 8 | #include <utmp.h> |
8 | #include <sys/resource.h> | 9 | #include <sys/resource.h> |
9 | #include <syslog.h> | ||
10 | 10 | ||
11 | #if ENABLE_SELINUX | 11 | #if ENABLE_SELINUX |
12 | #include <selinux/selinux.h> /* for is_selinux_enabled() */ | 12 | #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 @@ | |||
6 | #include "libbb.h" | 6 | #include "libbb.h" |
7 | #include <syslog.h> | 7 | #include <syslog.h> |
8 | 8 | ||
9 | |||
10 | static void nuke_str(char *str) | 9 | static void nuke_str(char *str) |
11 | { | 10 | { |
12 | if (str) memset(str, 0, strlen(str)); | 11 | 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 @@ | |||
5 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 5 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <syslog.h> | ||
9 | |||
10 | #include "libbb.h" | 8 | #include "libbb.h" |
9 | #include <syslog.h> | ||
11 | 10 | ||
12 | //static void catchalarm(int ATTRIBUTE_UNUSED junk) | 11 | //static void catchalarm(int ATTRIBUTE_UNUSED junk) |
13 | //{ | 12 | //{ |