[haiku-commits] haiku: hrev48671 - src/system/kernel/fs
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 13 Jan 2015 16:22:44 +0100 (CET)
hrev48671 adds 1 changeset to branch 'master'
old head: a7d444d14560a4cb9836ccfe39c649f3dc1f028a
new head: 749bd21c457477b5480353705d1f98989c32b22e
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=749bd21+%5Ea7d444d
----------------------------------------------------------------------------
749bd21: 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.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48671
Commit: 749bd21c457477b5480353705d1f98989c32b22e
URL: http://cgit.haiku-os.org/haiku/commit/?id=749bd21
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Jan 13 15:21:14 2015 UTC
----------------------------------------------------------------------------
1 file changed, 4 insertions(+), 2 deletions(-)
src/system/kernel/fs/rootfs.cpp | 6 ++++--
----------------------------------------------------------------------------
diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp
index e16329a..90526ec 100644
--- a/src/system/kernel/fs/rootfs.cpp
+++ b/src/system/kernel/fs/rootfs.cpp
@@ -8,10 +8,12 @@
#if FS_SHELL
-# include <new>
-
# include "fssh_api_wrapper.h"
+# undef size_t
+# include <new>
+# define size_t fssh_size_t
+
# include "KOpenHashTable.h"
# include "list.h"
#else
Other related posts:
