diff options
| author | Eric Andersen | 2000-06-19 18:14:20 +0000 |
|---|---|---|
| committer | Eric Andersen | 2000-06-19 18:14:20 +0000 |
| commit | a15cd0be34c81f445be6a2c2234ab0d355b71fba (patch) | |
| tree | ac3f2319edbd5435588e2399386a2c63f3fdba4a | |
| parent | b7362e36a80b639a64da3f662cbd0064038cad8a (diff) | |
| download | busybox-a15cd0be34c81f445be6a2c2234ab0d355b71fba.zip busybox-a15cd0be34c81f445be6a2c2234ab0d355b71fba.tar.gz | |
Make syslogd.c, init.c, and update.c compile error/warning free under both libc5 and libc6.
-Erik
| -rw-r--r-- | init.c | 2 | ||||
| -rw-r--r-- | init/init.c | 2 | ||||
| -rw-r--r-- | miscutils/update.c | 6 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 6 | ||||
| -rw-r--r-- | syslogd.c | 6 | ||||
| -rw-r--r-- | update.c | 6 |
6 files changed, 14 insertions, 14 deletions
@@ -93,7 +93,7 @@ #if defined(__GLIBC__) #include <sys/kdaemon.h> #else -_syscall2(int, bdflush, int, func, int, data); +static _syscall2(int, bdflush, int, func, int, data); #endif /* __GLIBC__ */ diff --git a/init/init.c b/init/init.c index 0e12610..98a58f2 100644 --- a/init/init.c +++ b/init/init.c @@ -93,7 +93,7 @@ #if defined(__GLIBC__) #include <sys/kdaemon.h> #else -_syscall2(int, bdflush, int, func, int, data); +static _syscall2(int, bdflush, int, func, int, data); #endif /* __GLIBC__ */ diff --git a/miscutils/update.c b/miscutils/update.c index 14f1d3c..b86d84e 100644 --- a/miscutils/update.c +++ b/miscutils/update.c @@ -28,12 +28,14 @@ #include <sys/param.h> #include <sys/syslog.h> + #if defined(__GLIBC__) #include <sys/kdaemon.h> #else -_syscall2(int, bdflush, int, func, int, data); +static _syscall2(int, bdflush, int, func, int, data); #endif /* __GLIBC__ */ + static char update_usage[] = "update [options]\n" #ifndef BB_FEATURE_TRIVIAL_HELP @@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv) } } } - exit( TRUE); + return( TRUE); } /* diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index d2fbc3d..f4e7f45 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -42,12 +42,10 @@ #include <sys/param.h> #include <linux/unistd.h> -#ifndef socklen_t -typedef unsigned int socklen_t; -#endif - #if __GNU_LIBRARY__ < 5 +typedef unsigned int socklen_t; + #ifndef __alpha__ # define __NR_klogctl __NR_syslog static inline _syscall3(int, klogctl, int, type, char *, b, int, len); @@ -42,12 +42,10 @@ #include <sys/param.h> #include <linux/unistd.h> -#ifndef socklen_t -typedef unsigned int socklen_t; -#endif - #if __GNU_LIBRARY__ < 5 +typedef unsigned int socklen_t; + #ifndef __alpha__ # define __NR_klogctl __NR_syslog static inline _syscall3(int, klogctl, int, type, char *, b, int, len); @@ -28,12 +28,14 @@ #include <sys/param.h> #include <sys/syslog.h> + #if defined(__GLIBC__) #include <sys/kdaemon.h> #else -_syscall2(int, bdflush, int, func, int, data); +static _syscall2(int, bdflush, int, func, int, data); #endif /* __GLIBC__ */ + static char update_usage[] = "update [options]\n" #ifndef BB_FEATURE_TRIVIAL_HELP @@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv) } } } - exit( TRUE); + return( TRUE); } /* |