rootfs: fs_shel build fix attempt.
Sorry, I can't test all cases when building from Haiku. Including <new> after the fs shell wrapper makes the compiler fail because new needs a size_t argument (not an fssh_size_t). But including it before also fails because it includes C++ typedefs without the fssh wrapper, leading to conflicts. Undefining size_t just for the include of <new> isn't very clean, but seems to work. new gets a size_t argument as it should and the other typedefs aren't conflicting.
This commit is contained in:
@@ -8,10 +8,12 @@
|
|||||||
|
|
||||||
|
|
||||||
#if FS_SHELL
|
#if FS_SHELL
|
||||||
# include <new>
|
|
||||||
|
|
||||||
# include "fssh_api_wrapper.h"
|
# include "fssh_api_wrapper.h"
|
||||||
|
|
||||||
|
# undef size_t
|
||||||
|
# include <new>
|
||||||
|
# define size_t fssh_size_t
|
||||||
|
|
||||||
# include "KOpenHashTable.h"
|
# include "KOpenHashTable.h"
|
||||||
# include "list.h"
|
# include "list.h"
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user