From 70a5b6f8942803cc670632377485c75ebbbe6354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 13 Nov 2003 19:42:15 +0000 Subject: [PATCH] Fixed compilation on x86. Also moved the SmallDataStart() inline out of the structure definition. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5351 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/bfs/bfs.h | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/bfs.h b/src/add-ons/kernel/file_systems/bfs/bfs.h index aba6a04c14..997d9ea233 100644 --- a/src/add-ons/kernel/file_systems/bfs/bfs.h +++ b/src/add-ons/kernel/file_systems/bfs/bfs.h @@ -187,14 +187,6 @@ struct bfs_inode { small_data small_data_start[0]; #endif - inline small_data *SmallDataStart() const { - #if __MWERKS__ - return (small_data *)(&pad[4] /* last item in pad + sizeof(int32) */); - #else - return small_data_start; - #endif - } - int32 Magic1() const { return BFS_ENDIAN_TO_HOST_INT32(magic1); } int32 UserID() const { return BFS_ENDIAN_TO_HOST_INT32(uid); } int32 GroupID() const { return BFS_ENDIAN_TO_HOST_INT32(gid); } @@ -205,6 +197,8 @@ struct bfs_inode { bigtime_t LastModifiedTime() const { return BFS_ENDIAN_TO_HOST_INT64(last_modified_time); } bigtime_t CreateTime() const { return BFS_ENDIAN_TO_HOST_INT64(create_time); } + inline small_data *SmallDataStart(); + status_t InitCheck(Volume *volume); // defined in Inode.cpp }; @@ -382,4 +376,19 @@ small_data::IsLast(const bfs_inode *inode) const } +/************************ bfs_inode inline functions ************************/ +// #pragma mark - + + +inline small_data * +bfs_inode::SmallDataStart() +{ +#if __MWERKS__ + return (small_data *)(&pad[4] /* last item in pad + sizeof(int32) */); +#else + return small_data_start; +#endif +} + + #endif /* BFS_H */