diff options
| -rw-r--r-- | cp_mv.c | 2 | ||||
| -rw-r--r-- | internal.h | 4 | ||||
| -rw-r--r-- | mount.c | 4 | ||||
| -rw-r--r-- | nfsmount.c | 3 | ||||
| -rw-r--r-- | util-linux/mount.c | 4 | ||||
| -rw-r--r-- | util-linux/nfsmount.c | 3 |
6 files changed, 13 insertions, 7 deletions
@@ -188,7 +188,7 @@ rm_Action(const char *fileName, struct stat *statbuf, void* junk) extern int cp_mv_main(int argc, char **argv) { - int i; + volatile int i; char c; if (*applet_name == 'c' && *(applet_name + 1) == 'p') diff --git a/internal.h b/internal.h index e636e18ce..b31b902f0 100644 --- a/internal.h +++ b/internal.h @@ -297,8 +297,8 @@ extern int vdprintf(int d, const char *format, va_list ap); #endif #if defined BB_NFSMOUNT -int nfsmount(const char *spec, const char *node, unsigned long *flags, - char **extra_opts, char **mount_opts, int running_bg); +int nfsmount(const char *spec, const char *node, int *flags, + char **extra_opts, char **mount_opts, int running_bg); #endif #ifndef RB_POWER_OFF @@ -203,7 +203,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, /* Seperate standard mount options from the nonstandard string options */ static void -parse_mount_options(char *options, unsigned long *flags, char *strflags) +parse_mount_options(char *options, int *flags, char *strflags) { while (options) { int gotone = FALSE; @@ -342,7 +342,7 @@ extern int mount_main(int argc, char **argv) char string_flags_buf[1024] = ""; char *string_flags = string_flags_buf; char *extra_opts = string_flags_buf; - unsigned long flags = 0; + int flags = 0; char *filesystemType = "auto"; char *device = NULL; char *directory = NULL; diff --git a/nfsmount.c b/nfsmount.c index ad0b5842d..5c29b5f6b 100644 --- a/nfsmount.c +++ b/nfsmount.c @@ -33,6 +33,9 @@ * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp */ +#include "internal.h" +#undef FALSE +#undef TRUE #include <unistd.h> #include <stdio.h> #include <string.h> diff --git a/util-linux/mount.c b/util-linux/mount.c index 455e4a1c1..addeb0925 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -203,7 +203,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype, /* Seperate standard mount options from the nonstandard string options */ static void -parse_mount_options(char *options, unsigned long *flags, char *strflags) +parse_mount_options(char *options, int *flags, char *strflags) { while (options) { int gotone = FALSE; @@ -342,7 +342,7 @@ extern int mount_main(int argc, char **argv) char string_flags_buf[1024] = ""; char *string_flags = string_flags_buf; char *extra_opts = string_flags_buf; - unsigned long flags = 0; + int flags = 0; char *filesystemType = "auto"; char *device = NULL; char *directory = NULL; diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index ad0b5842d..5c29b5f6b 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -33,6 +33,9 @@ * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp */ +#include "internal.h" +#undef FALSE +#undef TRUE #include <unistd.h> #include <stdio.h> #include <string.h> |