diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2020-05-10 15:21:30 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2020-05-10 15:21:30 -0400 |
| commit | 657715ed754d69235aac62cd36f514f6dc65aab8 (patch) | |
| tree | 96e6f410510f5d009de950fee644ba32ae79d593 /lib/server | |
| parent | 6017757bc079f4446aa77bc5c0855c52741280f4 (diff) | |
New upstream version 0.13~~git20200326.g8e8b63c
Diffstat (limited to 'lib/server')
| -rw-r--r-- | lib/server/Daemon.cpp | 2 | ||||
| -rw-r--r-- | lib/server/ServerControl.cpp | 4 | ||||
| -rw-r--r-- | lib/server/ServerStream.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 76141b6f..748e6e47 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -702,7 +702,7 @@ int Daemon::Main(const std::string &rConfigFileName) } // Delete the PID file - ::unlink(pidFileName.c_str()); + EMU_UNLINK(pidFileName.c_str()); // Log BOX_NOTICE("Terminating daemon"); diff --git a/lib/server/ServerControl.cpp b/lib/server/ServerControl.cpp index b6cadab3..958302b8 100644 --- a/lib/server/ServerControl.cpp +++ b/lib/server/ServerControl.cpp @@ -241,7 +241,7 @@ bool KillServer(const std::string& pid_file, bool WaitForProcess) #ifdef WIN32 if(WaitForProcess) { - int unlink_result = unlink(pid_file.c_str()); + int unlink_result = EMU_UNLINK(pid_file.c_str()); TEST_EQUAL_LINE(0, unlink_result, std::string("unlink ") + pid_file); if(unlink_result != 0) { @@ -439,7 +439,7 @@ bool StopDaemon(int current_pid, const std::string& pid_file, TEST_THAT_OR(!ServerIsAlive(current_pid), return false); #ifdef WIN32 - int unlink_result = unlink(pid_file.c_str()); + int unlink_result = EMU_UNLINK(pid_file.c_str()); TEST_EQUAL_LINE(0, unlink_result, std::string("unlink ") + pid_file); if(unlink_result != 0) { diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h index db8beaf2..bf508311 100644 --- a/lib/server/ServerStream.h +++ b/lib/server/ServerStream.h @@ -208,7 +208,7 @@ public: } // unlink anything there - ::unlink(c[1].c_str()); + EMU_UNLINK(c[1].c_str()); psocket->Listen(Socket::TypeUNIX, c[1].c_str()); #endif // WIN32 |