sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Amd64 cross-compilation fix.

Browse source 
* Remove usage of _MINIX and __i386__ in mkfs.c  to make
  conditional compilation orthogonal.
This commit is contained in:
Kees Jongenburger 2012-08-27 15:31:03 +00:00
parent 41ab295654
commit 2af02e0d5d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr.sbin/mkfs.mfs/mkfs.c
View file

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