From b622d2b795b3a2e31c707edda4cf7f0e0472d898 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Tue, 26 Feb 2013 15:18:28 +0000
Subject: [PATCH] mkfs.mfs fixup

 For the special case of crossbuilding minix on minix.
---
 usr.sbin/mkfs.mfs/mkfs.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/usr.sbin/mkfs.mfs/mkfs.c b/usr.sbin/mkfs.mfs/mkfs.c
index b76f3c7ce..3a1ab3261 100644
--- a/usr.sbin/mkfs.mfs/mkfs.c
+++ b/usr.sbin/mkfs.mfs/mkfs.c
@@ -35,6 +35,7 @@
 #include <minix/u64.h>
 #include <minix/minlib.h>
 #include <sys/ioctl.h>
+#include <strings.h>
 #endif
 #include <dirent.h>
 
@@ -64,10 +65,9 @@
 #endif
 #endif
 
-#if !defined(__minix)
 typedef uint32_t block_t;
 typedef uint32_t zone_t;
-#endif
+typedef uint32_t bitchunk_t;
 
 extern char *optarg;
 extern int optind;
@@ -1014,26 +1014,13 @@ int bit;
 {
   /* Insert 'count' bits in the bitmap */
   int w, s;
-#if defined(__minix)
   bitchunk_t *buf;
-#else
-  uint32_t *buf;
-#endif
 
-#if defined(__minix)
   buf = (bitchunk_t *) alloc_block();
-#else
-  buf = (uint32_t *) alloc_block();
-#endif
 
   get_block(block, (char *) buf);
-#if defined(__minix)
   w = bit / (8 * sizeof(bitchunk_t));
   s = bit % (8 * sizeof(bitchunk_t));
-#else
-  w = bit / (8 * sizeof(uint32_t));
-  s = bit % (8 * sizeof(uint32_t));
-#endif
   buf[w] |= (1 << s);
   put_block(block, (char *) buf);