aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mount.c4
-rw-r--r--util-linux/nfsmount.c3
2 files changed, 5 insertions, 2 deletions
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>