Make syslogd.c, init.c, and update.c compile error/warning free under both libc5 and libc6.
-Erik
diff --git a/init.c b/init.c
index 0e12610..98a58f2 100644
--- a/init.c
+++ b/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/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 @@
}
}
}
- 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);
diff --git a/syslogd.c b/syslogd.c
index d2fbc3d..f4e7f45 100644
--- a/syslogd.c
+++ b/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);
diff --git a/update.c b/update.c
index 14f1d3c..b86d84e 100644
--- a/update.c
+++ b/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 @@
}
}
}
- exit( TRUE);
+ return( TRUE);
}
/*