Merge pull request #2855 from Diapolo/guard_CreatePidFile

exclude CreatePidFile() function on WIN32 as it is unused

diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index bc23cf55071009fc06f483d1b02f6fb38abd5a9d..be18f9ae833895c92475da43f66b52f3ce8fd9ed 100644 (file)
--- 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 c4212b39845d93e11463e10077b1800073138134..049e55b7d6b8b32bc4b74a3b583073acb7ddb50a 100644 (file)
--- 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 9ca73f3311a5fa2b343b19cb27b683378fedc672..9aea56440602de2bed5cdbc3529ec94aabeae28c 100644 (file)
--- 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);