From: Theodore Ts'o Date: Mon, 2 Oct 2006 01:42:21 +0000 (-0400) Subject: Fix build problem if byte swapping has been disabled. X-Git-Tag: E2FSPROGS-1_40-WIP-1114~41 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fa2d516fb353d3dba3a6b0dad309d8ea76a2e15c;p=tools%2Fe2fsprogs.git Fix build problem if byte swapping has been disabled. Signed-off-by: "Theodore Ts'o" --- diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 2ce8a6b..e3a9aad 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,8 @@ +2006-10-01 Theodore Tso + + * bitops.h (ext2fs_swab32): Only include ext2fs_swab32() if + EXT2FS_ENABLE_SWAPFS is defined. + 2006-08-30 Eric Sandeen * initialize.c (ext2fs_initialize): Make sure inode count does diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h index 6583a3a..d93e4e9 100644 --- a/lib/ext2fs/bitops.h +++ b/lib/ext2fs/bitops.h @@ -288,13 +288,13 @@ _INLINE_ __u16 ext2fs_swab16(__u16 val) : "0" (val)); \ return val; } -#endif _INLINE_ __u64 ext2fs_swab64(__u64 val) { return (ext2fs_swab32(val >> 32) | (((__u64)ext2fs_swab32(val & 0xFFFFFFFFUL)) << 32)); } +#endif #undef EXT2FS_ADDR