From 7335776148f610190c261ef6a738cdec2f7393d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 7 Jun 2004 22:42:55 +0000 Subject: [PATCH] Changes to keep it building with the move to kernel_interface_r5.cpp. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7819 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile | 8 +++++--- .../file_systems/bfs/bfs_shell/additional_commands.c | 3 +++ src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile index 76265c9619..8ec8b28969 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile @@ -14,7 +14,9 @@ UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp malloc_debug_flags = -fcheck-memory-usage ; } - local defines = [ FDefines USER DEBUG USED_IN_FS_SHELL + local defines = [ FDefines USER + #DEBUG + USED_IN_FS_SHELL NO_FILE_UNCACHED_IO UNSAFE_GET_VNODE #BFS_BIG_ENDIAN_ONLY $(malloc_debug_defines) ] ; @@ -27,7 +29,7 @@ SimpleTest bfs_shell : sysdep.c hexdump.c argv.c Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp - BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp + BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp Debug.cpp kernel_cpp.cpp : ; @@ -35,7 +37,7 @@ SimpleTest bfs_shell : # Tell Jam where to find these sources SEARCH on [ FGristFiles Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp - BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp + BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp Debug.cpp cpp.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ; diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c index 6586695ada..3acaf91962 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c +++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c @@ -11,6 +11,9 @@ */ +#define _FS_INTERFACE_H + // don't include that file + #include "bfs_control.h" diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile index 01d8845219..30adb5499b 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile @@ -31,7 +31,7 @@ SimpleTest mkbfs : rootfs.c Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp - BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp + BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp Debug.cpp : ; @@ -43,7 +43,7 @@ SimpleTest allocationGroups : # Tell Jam where to find these sources SEARCH on [ FGristFiles Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp - BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp + BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp Debug.cpp ] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;