From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 19 Jun 2000 18:14:20 +0000 (-0000)
Subject: Make syslogd.c, init.c, and update.c compile error/warning free under both libc5... 
X-Git-Tag: 0_45~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a15cd0be34c81f445be6a2c2234ab0d355b71fba;p=oweals%2Fbusybox.git

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 0e126104b..98a58f275 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 0e126104b..98a58f275 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 14f1d3c20..b86d84e06 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 d2fbc3d87..f4e7f459b 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 d2fbc3d87..f4e7f459b 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 14f1d3c20..b86d84e06 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 @@ extern int update_main(int argc, char **argv)
 			}
 		}
 	}
-	exit( TRUE);
+	return( TRUE);
 }
 
 /*