-#include <stdbool.h>

4 files changed, 13 insertions, 16 deletions

diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 61f6f32d6c8..6a00c2ccdba 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.c,v 1.9 2016/10/22 19:17:47 natano Exp $	*/
+/*	$OpenBSD: cd9660.c,v 1.10 2016/10/22 20:50:21 natano Exp $	*/
 /*	$NetBSD: cd9660.c,v 1.52 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -208,7 +208,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure)
 
 	/* Spec breaking functionality */
 	diskStructure->allow_deep_trees =
-	    diskStructure->allow_start_dot =
 	    diskStructure->allow_max_name =
 	    diskStructure->allow_illegal_chars =
 	    diskStructure->allow_lowercase =
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index f519f495ec3..0b2f5eff0e0 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.5 2016/10/18 16:50:55 natano Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.6 2016/10/22 20:50:21 natano Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -276,13 +276,12 @@ typedef struct _iso9660_disk {
 	int chrp_boot;
 
 	/* Spec breaking options */
-	u_char allow_deep_trees;
-	u_char allow_start_dot;
-	u_char allow_max_name; /* Allow 37 char filenames*/
-	u_char allow_illegal_chars; /* ~, !, # */
-	u_char allow_lowercase;
-	u_char allow_multidot;
-	u_char omit_trailing_period;
+	int allow_deep_trees;
+	int allow_max_name; /* Allow 37 char filenames*/
+	int allow_illegal_chars; /* ~, !, # */
+	int allow_lowercase;
+	int allow_multidot;
+	int omit_trailing_period;
 
 	/* BOOT INFORMATION HERE */
 	int has_generic_bootimage; /* Default to 0 */
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 2a720d2d7b4..a4fced6be3e 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makefs.c,v 1.13 2016/10/22 19:17:47 natano Exp $	*/
+/*	$OpenBSD: makefs.c,v 1.14 2016/10/22 20:50:21 natano Exp $	*/
 /*	$NetBSD: makefs.c,v 1.53 2015/11/27 15:10:32 joerg Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdbool.h>
 #include <util.h>
 
 #include "makefs.h"
@@ -252,7 +251,7 @@ set_option_var(const option_t *options, const char *var, const char *val,
 			continue;
 		switch (options[i].type) {
 		case OPT_BOOL:
-			*(bool *)options[i].value = 1;
+			*(int *)options[i].value = 1;
 			break;
 		case OPT_STRARRAY:
 			strlcpy((void *)options[i].value, val, (size_t)
diff --git a/usr.sbin/makefs/msdos/mkfs_msdos.h b/usr.sbin/makefs/msdos/mkfs_msdos.h
index 6ee2406f7a6..f43ad01d84e 100644
--- a/usr.sbin/makefs/msdos/mkfs_msdos.h
+++ b/usr.sbin/makefs/msdos/mkfs_msdos.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs_msdos.h,v 1.1 2016/10/18 17:05:30 natano Exp $	*/
+/*	$OpenBSD: mkfs_msdos.h,v 1.2 2016/10/22 20:50:21 natano Exp $	*/
 /*	$NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $	*/
 
 /*-
@@ -31,7 +31,7 @@
  */
 
 #include <sys/types.h>
-#include <stdbool.h>
+
 #define ALLOPTS \
 AOPT('@', off_t, offset, 0, "Offset in device") \
 AOPT('B', char *, bootstrap, -1, "Bootstrap file") \
@@ -39,7 +39,7 @@ AOPT('C', off_t, create_size, 0, "Create file") \
 AOPT('F', uint8_t,  fat_type, 12, "FAT type (12, 16, or 32)") \
 AOPT('I', uint32_t, volume_id, 0, "Volume ID") \
 AOPT('L', char *, volume_label, -1, "Volume Label") \
-AOPT('N', bool, no_create, -2, "Don't create filesystem, print params only") \
+AOPT('N', int, no_create, -2, "Don't create filesystem, print params only") \
 AOPT('O', char *, OEM_string, -1, "OEM string") \
 AOPT('S', uint16_t, bytes_per_sector, 1, "Bytes per sector") \
 AOPT('a', uint32_t, sectors_per_fat, 1, "Sectors per FAT") \