diff options
author | LaMont Jones <lamont@debian.org> | 2010-01-18 08:02:28 -0700 |
---|---|---|
committer | LaMont Jones <lamont@debian.org> | 2010-01-18 08:02:28 -0700 |
commit | c3701c1d965cdc905bd580ece68a1c4008b4d1b0 (patch) | |
tree | b17b28d580bec649a61d93498fc5bf51acb3f965 /disk-utils | |
parent | dcdaeb08fa71025ceb0f5923a05fcce0aa70b0c3 (diff) | |
parent | 86dccccf24f22e8fc76f1e450899c830671a4f57 (diff) | |
download | util-linux-old-c3701c1d965cdc905bd580ece68a1c4008b4d1b0.tar.gz |
Merge branch 'stable/v2.16'
Conflicts:
AUTHORS
NEWS
configure.ac
debian/changelog
disk-utils/fsck.minix.c
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
shlibs/blkid/src/probe.c
shlibs/blkid/src/superblocks/iso9660.c
shlibs/blkid/src/superblocks/vfat.c
Diffstat (limited to 'disk-utils')
-rw-r--r-- | disk-utils/fsck.minix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index 0ce71964..3fb80a35 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -107,6 +107,10 @@ #include "pathnames.h" #include "bitops.h" +#ifndef __linux__ +#define volatile +#endif + #define ROOT_INO 1 #define UPPER(size,n) ((size+((n)-1))/(n)) |