Fixed boot loader BFS build which I broke with my recent changes.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20861 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -13,6 +13,10 @@
|
|||||||
#include "system_dependencies.h"
|
#include "system_dependencies.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef _BOOT_MODE
|
||||||
|
namespace BFS {
|
||||||
|
#endif
|
||||||
|
|
||||||
// ToDo: temporary fix! (missing but public ioctls)
|
// ToDo: temporary fix! (missing but public ioctls)
|
||||||
#define IOCTL_FILE_UNCACHED_IO 10000
|
#define IOCTL_FILE_UNCACHED_IO 10000
|
||||||
|
|
||||||
@@ -364,5 +368,8 @@ small_data::IsLast(const bfs_inode *inode) const
|
|||||||
return (uint32)this > (uint32)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
|
return (uint32)this > (uint32)inode + inode->InodeSize() - sizeof(small_data) || name_size == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _BOOT_MODE
|
||||||
|
} // namespace BFS
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* BFS_H */
|
#endif /* BFS_H */
|
||||||
|
|||||||
@@ -22,6 +22,9 @@
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <ByteOrder.h>
|
||||||
|
|
||||||
|
#ifndef _BOOT_MODE
|
||||||
#include <fs_attr.h>
|
#include <fs_attr.h>
|
||||||
#include <fs_cache.h>
|
#include <fs_cache.h>
|
||||||
#include <fs_index.h>
|
#include <fs_index.h>
|
||||||
@@ -29,12 +32,12 @@
|
|||||||
#include <fs_interface.h>
|
#include <fs_interface.h>
|
||||||
#include <fs_query.h>
|
#include <fs_query.h>
|
||||||
#include <fs_volume.h>
|
#include <fs_volume.h>
|
||||||
#include <ByteOrder.h>
|
|
||||||
#include <Drivers.h>
|
#include <Drivers.h>
|
||||||
#include <KernelExport.h>
|
#include <KernelExport.h>
|
||||||
#include <NodeMonitor.h>
|
#include <NodeMonitor.h>
|
||||||
#include <SupportDefs.h>
|
#include <SupportDefs.h>
|
||||||
#include <TypeConstants.h>
|
#include <TypeConstants.h>
|
||||||
|
#endif // _BOOT_MODE
|
||||||
|
|
||||||
#include <util/DoublyLinkedList.h>
|
#include <util/DoublyLinkedList.h>
|
||||||
#include <util/kernel_cpp.h>
|
#include <util/kernel_cpp.h>
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ UsePrivateHeaders kernel storage ;
|
|||||||
|
|
||||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
|
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
|
||||||
|
|
||||||
SubDirC++Flags -fno-rtti ;
|
local defines = [ FDefines _BOOT_MODE ] ;
|
||||||
|
|
||||||
|
SubDirCcFlags $(defines) ;
|
||||||
|
SubDirC++Flags -fno-rtti $(defines) ;
|
||||||
|
|
||||||
KernelStaticLibrary boot_bfs :
|
KernelStaticLibrary boot_bfs :
|
||||||
bfs.cpp
|
bfs.cpp
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ namespace boot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
namespace BFS {
|
|
||||||
|
|
||||||
#include "bfs.h"
|
#include "bfs.h"
|
||||||
|
|
||||||
|
namespace BFS {
|
||||||
|
|
||||||
class Directory;
|
class Directory;
|
||||||
|
|
||||||
class Volume {
|
class Volume {
|
||||||
|
|||||||
Reference in New Issue
Block a user