[haiku-commits] haiku: hrev48675 - headers/private/fs_shell src/system/kernel/fs
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 14 Jan 2015 10:22:31 +0100 (CET)
hrev48675 adds 1 changeset to branch 'master'
old head: 6e35da8308de928fde24b883082cc9bdcdcf295d
new head: 98731302d80db5603b3483ea6697a775cd89d86d
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=98731302d80d+%5E6e35da8308de
----------------------------------------------------------------------------
98731302d80d: fssh_api_wrapper: fix build on non-Haiku.
* I'm not sure why strings.h needs to be included before <new>, but it
wouldn't work otherwise.
[ PulkoMandy <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48675
Commit: 98731302d80db5603b3483ea6697a775cd89d86d
URL: http://cgit.haiku-os.org/haiku/commit/?id=98731302d80d
Author: PulkoMandy <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Jan 14 09:15:15 2015 UTC
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 4 deletions(-)
headers/private/fs_shell/fssh_api_wrapper.h | 4 ++++
src/system/kernel/fs/rootfs.cpp | 4 ----
----------------------------------------------------------------------------
diff --git a/headers/private/fs_shell/fssh_api_wrapper.h
b/headers/private/fs_shell/fssh_api_wrapper.h
index 6a9e601..337648f 100644
--- a/headers/private/fs_shell/fssh_api_wrapper.h
+++ b/headers/private/fs_shell/fssh_api_wrapper.h
@@ -6,6 +6,10 @@
#define _FSSH_API_WRAPPER_H
+#include <string.h>
+#ifdef __cplusplus
+#include <new>
+#endif
#include <stdlib.h>
#include "fssh_dirent.h"
diff --git a/src/system/kernel/fs/rootfs.cpp b/src/system/kernel/fs/rootfs.cpp
index 90526ec..9d00152 100644
--- a/src/system/kernel/fs/rootfs.cpp
+++ b/src/system/kernel/fs/rootfs.cpp
@@ -10,10 +10,6 @@
#if FS_SHELL
# 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:
- » [haiku-commits] haiku: hrev48675 - headers/private/fs_shell src/system/kernel/fs - pulkomandy
