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 /miscutils | |
| 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 'miscutils')
| -rw-r--r-- | miscutils/crond.c | 2 | ||||
| -rw-r--r-- | miscutils/devfsd.c | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c index fd20e6a57..0df143ae7 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 11 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <sys/syslog.h> | ||
| 15 | #include "libbb.h" | 14 | #include "libbb.h" |
| 15 | #include <syslog.h> | ||
| 16 | 16 | ||
| 17 | #ifndef CRONTABS | 17 | #ifndef CRONTABS |
| 18 | #define CRONTABS "/var/spool/cron/crontabs" | 18 | #define CRONTABS "/var/spool/cron/crontabs" |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 9990142c2..52a65bc98 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
| @@ -53,17 +53,12 @@ | |||
| 53 | The postal address is: | 53 | The postal address is: |
| 54 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. | 54 | Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. |
| 55 | */ | 55 | */ |
| 56 | |||
| 57 | //#include <sys/wait.h> | ||
| 58 | //#include <sys/ioctl.h> | ||
| 59 | //#include <sys/socket.h> | ||
| 60 | #include <sys/un.h> | ||
| 61 | #include <dirent.h> | ||
| 62 | #include <syslog.h> | ||
| 63 | #include <sys/sysmacros.h> | ||
| 64 | #include "libbb.h" | 56 | #include "libbb.h" |
| 65 | #include "xregex.h" | 57 | #include "xregex.h" |
| 58 | #include <syslog.h> | ||
| 66 | 59 | ||
| 60 | #include <sys/un.h> | ||
| 61 | #include <sys/sysmacros.h> | ||
| 67 | 62 | ||
| 68 | /* Various defines taken from linux/major.h */ | 63 | /* Various defines taken from linux/major.h */ |
| 69 | #define IDE0_MAJOR 3 | 64 | #define IDE0_MAJOR 3 |
