A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few

shadowed variables.  Move (almost) all syscalls to libbb/syscalls.c, so I can
handle them sanely and all at once.
 -Erik

1 files changed, 8 insertions, 5 deletions

diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 55022ae3b..ce0e2c6cc 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -29,13 +29,16 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/mount.h>
-#include <sys/syscall.h>
-#include <linux/unistd.h>
-#include "busybox.h"
 
-static _syscall2(int, swapon, const char *, path, int, flags);
-static _syscall1(int, swapoff, const char *, path);
+#if __GNU_LIBRARY__ < 5
+/* libc5 doesn't have sys/swap.h, define these here. */ 
+extern int swapon (__const char *__path, int __flags);
+extern int swapoff (__const char *__path);
+#else
+#include <sys/swap.h>
+#endif
 
+#include "busybox.h"
 
 static int whichApp;