* src/LaTeX.C (deplog): fix the regex to parse filenames in the log file

[lyx.git] / src / support / kill.C

diff --git a/src/support/kill.C b/src/support/kill.C
index 9e5009ae74e4c4f270b672b88dab64c4e0f0b357..3d100969a776f25d843d81d44f98f8c025acda12 100644 (file)
--- a/src/support/kill.C
+++ b/src/support/kill.C
@@ -22,33 +22,32 @@
 #include "os.h"
 
 #include <windows.h>
-#include <errno.h>
-
-using std::endl;
+#include <cerrno>
 #endif //_WIN32
 
-int lyx::support::kill(int pid, int sig)
+namespace lyx {
+
+int support::kill(int pid, int sig)
 {
 #ifdef _WIN32
-       if (pid == (int)GetCurrentProcessId()) {
-               return -(raise(sig));
-       } else {
-               HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, pid);
-               if (!hProcess) {
-                       lyxerr << "kill OpenProcess failed!" << endl;
-                       return -1;
-               } else {
-                       if (!TerminateProcess(hProcess, sig)){
-                               lyxerr << "kill process failed!" << endl;
-                               CloseHandle(hProcess);
-                               return -1;
-                       }
+       if (pid == (int)GetCurrentProcessId()) 
+               return -raise(sig);
+       HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, pid);
+       if (!hProcess) {
+               lyxerr << "kill OpenProcess failed!" << std::endl;
+               return -1;
+       }
+       if (!TerminateProcess(hProcess, sig)) {
+               lyxerr << "kill process failed!" << std::endl;
                CloseHandle(hProcess);
-               }
+               return -1;
        }
+       CloseHandle(hProcess);
        return 0;
-
 #else
        return ::kill(pid, sig);
 #endif
 }
+
+
+} // namespace lyx