diff --git a/libretroshare/src/file_sharing/directory_updater.cc b/libretroshare/src/file_sharing/directory_updater.cc index f162f898b..21c9a36dc 100644 --- a/libretroshare/src/file_sharing/directory_updater.cc +++ b/libretroshare/src/file_sharing/directory_updater.cc @@ -145,7 +145,7 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p std::string real_path = RsDirUtil::removeSymLinks(cumulated_path) ; if(existing_directories.end() != existing_directories.find(real_path)) { - std::cerr << "(EE) Directory " << cumulated_path << " has real path " << real_path << " which already belongs to another shared directory. Ignoring" << std::endl; + std::cerr << "(WW) Directory " << cumulated_path << " has real path " << real_path << " which already belongs to another shared directory. Ignoring" << std::endl; return ; } existing_directories.insert(real_path) ; diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc index a54abccaf..e89fff8e2 100644 --- a/libretroshare/src/util/rsdir.cc +++ b/libretroshare/src/util/rsdir.cc @@ -482,8 +482,8 @@ bool RsDirUtil::checkCreateDirectory(const std::string& dir) std::string RsDirUtil::removeSymLinks(const std::string& path) { -#warning (Mr.Alice): I don't know how to do this on windows. See https://msdn.microsoft.com/en-us/library/windows/desktop/hh707084(v=vs.85).aspx -#ifdef WINDOWS_SYS +#if defined(WINDOWS_SYS) || defined(__APPLE__) +#warning (Mr.Alice): I don't know how to do this on windows/MacOS. See https://msdn.microsoft.com/en-us/library/windows/desktop/hh707084(v=vs.85).aspx //if(!S_OK == PathCchCanonicalizeEx(tmp,...) ; return path ; #else