From: Kees Jongenburger <kees.jongenburger@gmail.com>
Date: Mon, 27 Aug 2012 15:31:03 +0000 (+0000)
Subject: Amd64 cross-compilation fix.
X-Git-Tag: v3.2.1~358
X-Git-Url: http://zhaoyanbai.com/repos/COPYRIGHT?a=commitdiff_plain;h=2af02e0d5ddb6e7817c0b8b6b84f3a2a669f59f6;p=minix.git

Amd64 cross-compilation fix.

* Remove usage of _MINIX and __i386__ in mkfs.c  to make
  conditional compilation orthogonal.
---

diff --git a/usr.sbin/mkfs.mfs/mkfs.c b/usr.sbin/mkfs.mfs/mkfs.c
index ea980be57..9a0fd9fab 100644
--- a/usr.sbin/mkfs.mfs/mkfs.c
+++ b/usr.sbin/mkfs.mfs/mkfs.c
@@ -24,7 +24,7 @@
 #include "const.h"
 #include "type.h"
 #include "mfsdir.h"
-#if (defined(__minix) && defined(__i386__))
+#if defined(__minix)
 #include <minix/partition.h>
 #include <minix/u64.h>
 #include <sys/ioctl.h>
@@ -277,7 +277,7 @@ char *argv[];
 		if (blocks == 0) pexit("Can't open prototype file");
 	}
 	if (i == 0) {
-#if defined(_MINIX) || defined(__minix)
+#if defined(__minix)
 		uint32_t kb = div64u(mul64u(blocks, block_size), 1024);
 #else
 		uint32_t kb = ((unsigned long long) blocks * block_size) / 1024;