diff options
-rw-r--r-- | cpukit/ChangeLog | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-file-system.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 63e1801bbc..4d98a19a9e 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,7 @@ 2010-06-17 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/rfs/rtems-rfs-file-system.h: Revert previous change. + Force RTEMS_RFS_VERSION_MASK to be 32bit. * libfs/src/rfs/rtems-rfs-rtems-dir.c: Various 64bit fixes. * libfs/src/rfs/rtems-rfs-format.c: Various 64bit fixes. * libfs/src/rfs/rtems-rfs-file-system.c: Various 64bit fixes. diff --git a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h b/cpukit/libfs/src/rfs/rtems-rfs-file-system.h index ceedd010f8..e97e66a108 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h +++ b/cpukit/libfs/src/rfs/rtems-rfs-file-system.h @@ -46,7 +46,7 @@ * RFS Version Number Mask. The mask determines which bits of the version * number indicate compatility issues. */ -#define RTEMS_RFS_VERSION_MASK (0x00000000) +#define RTEMS_RFS_VERSION_MASK INT32_C(0x00000000) /** * The root inode number. Do not use 0 as this has special meaning in some Unix @@ -308,7 +308,7 @@ struct _rtems_rfs_file_system * * @param _fs Pointer to the file system. */ -#define rtems_rfs_fs_size(_fs) (rtems_rfs_fs_blocks (_fs) * \ +#define rtems_rfs_fs_size(_fs) (((uint64_t) rtems_rfs_fs_blocks (_fs)) * \ rtems_rfs_fs_block_size (_fs)) /** |