diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:05:59 -0700 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:05:59 -0700 |
commit | e622f3f195f417f3098b9717003f875954495f3c (patch) | |
tree | 066936cd3ddd490f3118970ccedc2a08dbcd1ee4 | |
parent | a4ae02969e6c8fd6f17ac5f2f495149476463344 (diff) | |
parent | a034c7ebb6995c342fea289d04a6198d793eab08 (diff) |
Merge pull request #2855 from Diapolo/guard_CreatePidFile
exclude CreatePidFile() function on WIN32 as it is unused
-rw-r--r-- | src/bitcoind.cpp | 2 | ||||
-rw-r--r-- | src/util.cpp | 2 | ||||
-rw-r--r-- | src/util.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index bc23cf5507..be18f9ae83 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -74,7 +74,7 @@ bool AppInit(int argc, char* argv[]) int ret = CommandLineRPC(argc, argv); exit(ret); } -#if !defined(WIN32) +#ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { diff --git a/src/util.cpp b/src/util.cpp index c4212b3984..049e55b7d6 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1118,6 +1118,7 @@ boost::filesystem::path GetPidFile() return pathPidFile; } +#ifndef WIN32 void CreatePidFile(const boost::filesystem::path &path, pid_t pid) { FILE* file = fopen(path.string().c_str(), "w"); @@ -1127,6 +1128,7 @@ void CreatePidFile(const boost::filesystem::path &path, pid_t pid) fclose(file); } } +#endif bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest) { diff --git a/src/util.h b/src/util.h index 9ca73f3311..9aea564406 100644 --- a/src/util.h +++ b/src/util.h @@ -207,7 +207,9 @@ boost::filesystem::path GetDefaultDataDir(); const boost::filesystem::path &GetDataDir(bool fNetSpecific = true); boost::filesystem::path GetConfigFile(); boost::filesystem::path GetPidFile(); +#ifndef WIN32 void CreatePidFile(const boost::filesystem::path &path, pid_t pid); +#endif void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); #ifdef WIN32 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true); |