Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed canonicalize_file_name from MacOS compilation

Browse Source
This commit is contained in:
mr-alice 2016-11-25 20:33:27 +01:00
parent 5f69c9ea1f
commit 3f3efca22d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/file_sharing/directory_updater.cc
View File

@ -145,7 +145,7 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
std::string real_path = RsDirUtil::removeSymLinks(cumulated_path) ; std::string real_path = RsDirUtil::removeSymLinks(cumulated_path) ;
if(existing_directories.end() != existing_directories.find(real_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 ; return ;
} }
existing_directories.insert(real_path) ; existing_directories.insert(real_path) ;

4
libretroshare/src/util/rsdir.cc
View File

@ -482,8 +482,8 @@ bool RsDirUtil::checkCreateDirectory(const std::string& dir)
std::string RsDirUtil::removeSymLinks(const std::string& path) 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 #if defined(WINDOWS_SYS) || defined(__APPLE__)
#ifdef WINDOWS_SYS #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,...) ; //if(!S_OK == PathCchCanonicalizeEx(tmp,...) ;
return path ; return path ;
#else #else