From 3cdad2b904444f134720508eacc22820986b7bff Mon Sep 17 00:00:00 2001
From: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Mon, 19 Jun 2000 18:14:20 +0000
Subject: Make syslogd.c, init.c, and update.c compile error/warning free under
 both libc5 and libc6.  -Erik

git-svn-id: svn://busybox.net/trunk/busybox@664 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
 init.c             | 2 +-
 init/init.c        | 2 +-
 miscutils/update.c | 6 ++++--
 sysklogd/syslogd.c | 6 ++----
 syslogd.c          | 6 ++----
 update.c           | 6 ++++--
 6 files changed, 14 insertions(+), 14 deletions(-)

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);
 }
 
 /*
-- 
cgit v1.2.3-55-g6feb