From 752ad410c39ef1e15e6a96b31876143d057520fb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Sep 2003 00:43:40 +0000 Subject: [PATCH] Made the disk device manager stuff compilable again. Doesn't link yet, since user_memcpy() and user_strlcpy() are still missing in kernelland_emu.cpp. Tyler? git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4834 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/disk_device_manager/Jamfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/kernel/core/disk_device_manager/Jamfile b/src/kernel/core/disk_device_manager/Jamfile index 95744b3dc3..119b9d9794 100644 --- a/src/kernel/core/disk_device_manager/Jamfile +++ b/src/kernel/core/disk_device_manager/Jamfile @@ -6,13 +6,8 @@ SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kits storage ] ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel util ] ; -UsePrivateHeaders kernel ; - # This line must come before the "kernel arch $(OBOS_ARCH)" line, else - # the "arch/vm.h" file will be included instead of "vm.h" -UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ; UsePrivateHeaders shared ; UsePrivateHeaders storage ; -UseHeaders [ FDirName $(OBOS_TOP) src tests kits storage virtualdrive ] ; SharedLibrary disk_device_manager : ddm_userland_interface.cpp @@ -55,3 +50,13 @@ SharedLibrary disk_device_manager : LinkSharedOSLibs libdisk_device_manager.so : libkernelland_emu.so ; + +# Hack to enable ddm_userland_interface.cpp to include vm.h but not make +# kernel/stdio.h shadow the real stdio.h +ObjectHdrs [ FGristFiles ddm_userland_interface$(SUFOBJ) ] + : [ PrivateHeaders kernel [ FDirName kernel arch $(OBOS_ARCH) ] ] ; + +# KFileDiskDevice.cpp needs the virtualdrive.h Header. Add it here to not +# contaminate the include paths for the other files. +ObjectHdrs [ FGristFiles KFileDiskDevice$(SUFOBJ) ] + : [ FDirName $(OBOS_TOP) src tests kits storage virtualdrive ] ;