From 749bd21c457477b5480353705d1f98989c32b22e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 13 Jan 2015 16:21:14 +0100 Subject: [PATCH] rootfs: fs_shel build fix attempt. Sorry, I can't test all cases when building from Haiku. Including 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 isn't very clean, but seems to work. new gets a size_t argument as it should and the other typedefs aren't conflicting. --- src/system/kernel/fs/rootfs.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp index e16329ab17..90526ec554 100644 --- a/src/system/kernel/fs/rootfs.cpp +++ b/src/system/kernel/fs/rootfs.cpp @@ -8,10 +8,12 @@ #if FS_SHELL -# include - # include "fssh_api_wrapper.h" +# undef size_t +# include +# define size_t fssh_size_t + # include "KOpenHashTable.h" # include "list.h" #else