From 16cbf01021ccb015262d285c4d1cd87382db2c1d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 3 Dec 2008 15:15:16 +0100 Subject: [PATCH] blkid: use posix uint32_t in ocfs superblock Signed-off-by: Karel Zak --- libs/blkid/src/probers/ocfs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/blkid/src/probers/ocfs.c b/libs/blkid/src/probers/ocfs.c index 7340b4e8..12e4418a 100644 --- a/libs/blkid/src/probers/ocfs.c +++ b/libs/blkid/src/probers/ocfs.c @@ -30,18 +30,18 @@ struct ocfs_volume_label { unsigned char vol_id_len[2]; }; -#define ocfsmajor(o) ( (__u32) o.major_version[0] \ - + (((__u32) o.major_version[1]) << 8) \ - + (((__u32) o.major_version[2]) << 16) \ - + (((__u32) o.major_version[3]) << 24)) - -#define ocfsminor(o) ( (__u32) o.minor_version[0] \ - + (((__u32) o.minor_version[1]) << 8) \ - + (((__u32) o.minor_version[2]) << 16) \ - + (((__u32) o.minor_version[3]) << 24)) - -#define ocfslabellen(o) ((__u32)o.label_len[0] + (((__u32) o.label_len[1]) << 8)) -#define ocfsmountlen(o) ((__u32)o.mount_len[0] + (((__u32) o.mount_len[1]) << 8)) +#define ocfsmajor(o) ( (uint32_t) o.major_version[0] \ + + (((uint32_t) o.major_version[1]) << 8) \ + + (((uint32_t) o.major_version[2]) << 16) \ + + (((uint32_t) o.major_version[3]) << 24)) + +#define ocfsminor(o) ( (uint32_t) o.minor_version[0] \ + + (((uint32_t) o.minor_version[1]) << 8) \ + + (((uint32_t) o.minor_version[2]) << 16) \ + + (((uint32_t) o.minor_version[3]) << 24)) + +#define ocfslabellen(o) ((uint32_t)o.label_len[0] + (((uint32_t) o.label_len[1]) << 8)) +#define ocfsmountlen(o) ((uint32_t)o.mount_len[0] + (((uint32_t) o.mount_len[1]) << 8)) struct ocfs2_super_block { unsigned char signature[8]; -- 2.39.5