Browse Source

Merge pull request #2855 from Diapolo/guard_CreatePidFile

exclude CreatePidFile() function on WIN32 as it is unused
0.10
Gavin Andresen 11 years ago
parent
commit
e622f3f195
  1. 2
      src/bitcoind.cpp
  2. 2
      src/util.cpp
  3. 2
      src/util.h

2
src/bitcoind.cpp

@ -74,7 +74,7 @@ bool AppInit(int argc, char* argv[]) @@ -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)
{

2
src/util.cpp

@ -1118,6 +1118,7 @@ boost::filesystem::path GetPidFile() @@ -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) @@ -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)
{

2
src/util.h

@ -207,7 +207,9 @@ boost::filesystem::path GetDefaultDataDir(); @@ -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);

Loading…
Cancel
Save