From 5543f13539dffce340ac1be29b4744b5d1cbf822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 8 Jan 2006 16:25:28 +0000 Subject: [PATCH] our elf resolver has a problem with previous way of linking with FSUtils git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15875 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/installer/CopyEngine.cpp | 8 -------- src/apps/installer/FSUtils.h | 2 ++ src/apps/installer/InstallerCopyLoopControl.h | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp index cc67f4bc9b..d6ab6c1caa 100644 --- a/src/apps/installer/CopyEngine.cpp +++ b/src/apps/installer/CopyEngine.cpp @@ -15,14 +15,6 @@ #include #include -namespace BPrivate { - -extern status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl, - BPoint *loc, bool makeOriginalName, Undo &undo); -} // namespace BPrivate - -using namespace BPrivate; - extern void SizeAsString(off_t size, char *string); class SourceVisitor : public BDiskDeviceVisitor diff --git a/src/apps/installer/FSUtils.h b/src/apps/installer/FSUtils.h index acb4288e9d..5e87dcab23 100644 --- a/src/apps/installer/FSUtils.h +++ b/src/apps/installer/FSUtils.h @@ -150,6 +150,8 @@ TrackerCopyLoopControl::TrackerCopyLoopControl(thread_id thread) #endif _IMPEXP_TRACKER status_t FSCopyAttributesAndStats(BNode *, BNode *); +_IMPEXP_TRACKER status_t FSCopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl, + BPoint *loc, bool makeOriginalName, Undo &undo); _IMPEXP_TRACKER void FSDuplicate(BObjectList *srcList, BList *pointList); _IMPEXP_TRACKER void FSMoveToFolder(BObjectList *srcList, BEntry *, uint32 moveMode, BList *pointList = NULL); diff --git a/src/apps/installer/InstallerCopyLoopControl.h b/src/apps/installer/InstallerCopyLoopControl.h index 26bebd9177..b3ec64364e 100644 --- a/src/apps/installer/InstallerCopyLoopControl.h +++ b/src/apps/installer/InstallerCopyLoopControl.h @@ -7,6 +7,7 @@ #ifndef _INSTALLERCOPYLOOPCONTROL_H #define _INSTALLERCOPYLOOPCONTROL_H +#include "FSUndoRedo.h" #include "FSUtils.h" class InstallerWindow;