Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 19:19:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXT2FS] For some reason we get error: conflicting types for 'do_split' when compiling with clang-cl so work around this with FIXMEs. CORE-11799 (#94)

Browse source
This commit is contained in:
Amine Khaldi 2017-11-19 15:42:03 +01:00
parent 06b0cc74c5
commit b3172ae098
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/filesystems/ext2/inc/ext2fs.h
View file

@ -2495,7 +2495,8 @@ struct buffer_head *ext3_bread(struct ext2_icb *icb, struct inode *inode,
int add_dirent_to_buf(struct ext2_icb *icb, struct dentry *dentry, int add_dirent_to_buf(struct ext2_icb *icb, struct dentry *dentry,
struct inode *inode, struct ext3_dir_entry_2 *de, struct inode *inode, struct ext3_dir_entry_2 *de,
struct buffer_head *bh); struct buffer_head *bh);
#if !defined(__REACTOS__) || defined(_MSC_VER) #if !defined(__REACTOS__) || (defined(_MSC_VER) && !defined(__clang__))
/* FIXME: Inspect the clang-cl code path */
struct ext3_dir_entry_2 * struct ext3_dir_entry_2 *
do_split(struct ext2_icb *icb, struct inode *dir, do_split(struct ext2_icb *icb, struct inode *dir,
struct buffer_head **bh,struct dx_frame *frame, struct buffer_head **bh,struct dx_frame *frame,

5
drivers/filesystems/ext2/src/ext3/htree.c
View file

@ -1596,6 +1596,11 @@ int ext3_release_dir (struct inode * inode, struct file * filp)
return 0; return 0;
} }
/* FIXME: Inspect the clang-cl code path */
#if defined(__REACTOS__) && defined(__clang__)
struct ext3_dir_entry_2* do_split(struct ext2_icb *icb, struct inode *dir, struct buffer_head **bh,struct dx_frame *frame, struct dx_hash_info *hinfo, int *error);
#endif
/* /*
* Returns 0 for success, or a negative error value * Returns 0 for success, or a negative error value
*/ */