diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index 727cc98e..ba793716 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -120,7 +120,7 @@ int parse_options (int argc, char **argv)
 	opts.inode = -1;
 	opts.attr = -1;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index 8d0f8adc..89603df6 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -217,7 +217,7 @@ static void parse_options(int argc, char **argv)
 
 	memset(&opt, 0, sizeof(opt));
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (opt.volume)
diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c
index e80f7af2..3b278a8a 100644
--- a/ntfsprogs/ntfscluster.c
+++ b/ntfsprogs/ntfscluster.c
@@ -126,7 +126,7 @@ int parse_options (int argc, char **argv)
 	opts.range_begin = -1;
 	opts.range_end   = -1;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index bdab9eb0..37ef08bf 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -153,7 +153,7 @@ int parse_options (int argc, char *argv[])
 
 	opts.inode = -1;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 'd':	/* A non-option argument */
 			if (!opts.device) {
diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c
index 9e2a186d..00310f96 100644
--- a/ntfsprogs/ntfsls.c
+++ b/ntfsprogs/ntfsls.c
@@ -144,7 +144,7 @@ int parse_options(int argc, char *argv[])
 	opts.device = NULL;
 	opts.path = "/";
 
-	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 'd':
 			opts.device = optarg;
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index d503c497..4b33a055 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -389,7 +389,7 @@ static int parse_options(int argc, char **argv)
 	memset(&opt, 0, sizeof(opt));
 	opt.show_progress = 1;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!err && !opt.volume)
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index c3244e73..eace377e 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -302,7 +302,7 @@ int parse_options (int argc, char *argv[])
 	opts.percent  = -1;
 	opts.fillbyte = -1;
 
-	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, sopt, lopt, NULL)) != (char)-1) {
 		switch (c) {
 		case 1:	/* A non-option argument */
 			if (!opts.device) {
@@ -313,7 +313,7 @@ int parse_options (int argc, char *argv[])
 			}
 			break;
 		case 'b':
-			if (opts.fillbyte == -1) {
+			if (opts.fillbyte == (char)-1) {
 				end = NULL;
 				opts.fillbyte = strtol (optarg, &end, 0);
 				if (end && *end)
@@ -444,7 +444,8 @@ int parse_options (int argc, char *argv[])
 
 		switch (opts.mode) {
 		case MODE_SCAN:
-			if (opts.output || opts.dest || (opts.fillbyte != -1)) {
+			if (opts.output || opts.dest ||
+					(opts.fillbyte != (char)-1)) {
 				Eprintf ("Scan can only be used with --percent, "
 					"--match, --ignore-case, --size and --time.\n");
 				err++;
@@ -463,9 +464,11 @@ int parse_options (int argc, char *argv[])
 			}
 			break;
 		case MODE_COPY:
-			if ((opts.fillbyte != -1) || (opts.percent != -1) ||
-			    opts.match || opts.match_case ||
-			    (opts.size_begin > 0) || (opts.size_end > 0)) {
+			if ((opts.fillbyte != (char)-1) ||
+					(opts.percent != -1) ||
+					opts.match || opts.match_case ||
+					(opts.size_begin > 0) ||
+					(opts.size_end > 0)) {
 				Eprintf ("Copy can only be used with --output and --destination.\n");
 				err++;
 			}
@@ -491,7 +494,7 @@ int parse_options (int argc, char *argv[])
 		}
 	}
 
-	if (opts.fillbyte == -1)
+	if (opts.fillbyte == (char)-1)
 		opts.fillbyte = 0;
 
 	if (ver)