|
|
@ -513,7 +513,6 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread) |
|
|
|
|
|
|
|
|
|
|
|
fs::path GetDefaultDataDir() |
|
|
|
fs::path GetDefaultDataDir() |
|
|
|
{ |
|
|
|
{ |
|
|
|
namespace fs = fs; |
|
|
|
|
|
|
|
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
|
|
|
|
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
|
|
|
|
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
|
|
|
|
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
|
|
|
|
// Mac: ~/Library/Application Support/Bitcoin
|
|
|
|
// Mac: ~/Library/Application Support/Bitcoin
|
|
|
@ -544,7 +543,6 @@ static CCriticalSection csPathCached; |
|
|
|
|
|
|
|
|
|
|
|
const fs::path &GetDataDir(bool fNetSpecific) |
|
|
|
const fs::path &GetDataDir(bool fNetSpecific) |
|
|
|
{ |
|
|
|
{ |
|
|
|
namespace fs = fs; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LOCK(csPathCached); |
|
|
|
LOCK(csPathCached); |
|
|
|
|
|
|
|
|
|
|
@ -789,8 +787,6 @@ void ShrinkDebugFile() |
|
|
|
#ifdef WIN32 |
|
|
|
#ifdef WIN32 |
|
|
|
fs::path GetSpecialFolderPath(int nFolder, bool fCreate) |
|
|
|
fs::path GetSpecialFolderPath(int nFolder, bool fCreate) |
|
|
|
{ |
|
|
|
{ |
|
|
|
namespace fs = fs; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
char pszPath[MAX_PATH] = ""; |
|
|
|
char pszPath[MAX_PATH] = ""; |
|
|
|
|
|
|
|
|
|
|
|
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate)) |
|
|
|
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate)) |
|
|
|