i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation on x86. Also moved the SmallDataStart() inline out of

Browse Source 
the structure definition.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5351 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-11-13 19:42:15 +00:00
parent 938629a7e2
commit 70a5b6f894
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/bfs.h
+17 -8
View File
@@ -187,14 +187,6 @@ struct bfs_inode {
small_data small_data_start[0]; small_data small_data_start[0];
#endif #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 Magic1() const { return BFS_ENDIAN_TO_HOST_INT32(magic1); }
int32 UserID() const { return BFS_ENDIAN_TO_HOST_INT32(uid); } int32 UserID() const { return BFS_ENDIAN_TO_HOST_INT32(uid); }
int32 GroupID() const { return BFS_ENDIAN_TO_HOST_INT32(gid); } 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 LastModifiedTime() const { return BFS_ENDIAN_TO_HOST_INT64(last_modified_time); }
bigtime_t CreateTime() const { return BFS_ENDIAN_TO_HOST_INT64(create_time); } bigtime_t CreateTime() const { return BFS_ENDIAN_TO_HOST_INT64(create_time); }
inline small_data *SmallDataStart();
status_t InitCheck(Volume *volume); status_t InitCheck(Volume *volume);
// defined in Inode.cpp // 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 */ #endif /* BFS_H */