emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make syslogd.c, init.c, and update.c compile error/warning free under both libc5 and libc6.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen
2000-06-19 18:14:20 +00:00
parent b7362e36a8
commit a15cd0be34
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init.c
View File

@@ -93,7 +93,7 @@
#if defined(__GLIBC__) #if defined(__GLIBC__)
#include <sys/kdaemon.h> #include <sys/kdaemon.h>
#else #else
_syscall2(int, bdflush, int, func, int, data); static _syscall2(int, bdflush, int, func, int, data);
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */

2
init/init.c
View File

@@ -93,7 +93,7 @@
#if defined(__GLIBC__) #if defined(__GLIBC__)
#include <sys/kdaemon.h> #include <sys/kdaemon.h>
#else #else
_syscall2(int, bdflush, int, func, int, data); static _syscall2(int, bdflush, int, func, int, data);
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */

6
miscutils/update.c
View File

@@ -28,12 +28,14 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#if defined(__GLIBC__) #if defined(__GLIBC__)
#include <sys/kdaemon.h> #include <sys/kdaemon.h>
#else #else
_syscall2(int, bdflush, int, func, int, data); static _syscall2(int, bdflush, int, func, int, data);
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */
static char update_usage[] = static char update_usage[] =
"update [options]\n" "update [options]\n"
#ifndef BB_FEATURE_TRIVIAL_HELP #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv)
} }
} }
} }
exit( TRUE); return( TRUE);
} }
/* /*

6
sysklogd/syslogd.c
View File

@@ -42,12 +42,10 @@
#include <sys/param.h> #include <sys/param.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#ifndef socklen_t
typedef unsigned int socklen_t;
#endif
#if __GNU_LIBRARY__ < 5 #if __GNU_LIBRARY__ < 5
typedef unsigned int socklen_t;
#ifndef __alpha__ #ifndef __alpha__
# define __NR_klogctl __NR_syslog # define __NR_klogctl __NR_syslog
static inline _syscall3(int, klogctl, int, type, char *, b, int, len); static inline _syscall3(int, klogctl, int, type, char *, b, int, len);

6
syslogd.c
View File

@@ -42,12 +42,10 @@
#include <sys/param.h> #include <sys/param.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#ifndef socklen_t
typedef unsigned int socklen_t;
#endif
#if __GNU_LIBRARY__ < 5 #if __GNU_LIBRARY__ < 5
typedef unsigned int socklen_t;
#ifndef __alpha__ #ifndef __alpha__
# define __NR_klogctl __NR_syslog # define __NR_klogctl __NR_syslog
static inline _syscall3(int, klogctl, int, type, char *, b, int, len); static inline _syscall3(int, klogctl, int, type, char *, b, int, len);

6
update.c
View File

@@ -28,12 +28,14 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#if defined(__GLIBC__) #if defined(__GLIBC__)
#include <sys/kdaemon.h> #include <sys/kdaemon.h>
#else #else
_syscall2(int, bdflush, int, func, int, data); static _syscall2(int, bdflush, int, func, int, data);
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */
static char update_usage[] = static char update_usage[] =
"update [options]\n" "update [options]\n"
#ifndef BB_FEATURE_TRIVIAL_HELP #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv)
} }
} }
} }
exit( TRUE); return( TRUE);
} }
/* /*