diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-25 14:45:23 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-25 14:45:23 -0400 |
| commit | ae1515f19426daf13b55089e1c7da5f49f62b7eb (patch) | |
| tree | e0429e591983d0d85174aa2d81bbb4ff41039924 /Utility | |
| parent | 035761f4bcc17ca097900af166f1e66bc9ac5880 (diff) | |
build for windows with forked win32 package that has terminateProcessId
Get ugly reversion out of CHANGELOG.
Also, relocated the windows stack.yaml to top, and updated windows build
instructions.
This commit was sponsored by Henrik Riomar on Patreon.
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Daemon.hs | 4 | ||||
| -rw-r--r-- | Utility/WinProcess.hs | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 5c0ea4169..2cb0864d2 100644 --- a/Utility/Daemon.hs +++ b/Utility/Daemon.hs @@ -14,7 +14,7 @@ import Utility.PID #ifndef mingw32_HOST_OS import Utility.LogFile #else -import Utility.WinProcess +import System.Win32.Process (terminateProcessId) import Utility.LockFile #endif @@ -162,7 +162,7 @@ stopDaemon pidfile = go =<< checkDaemon pidfile #ifndef mingw32_HOST_OS signalProcess sigTERM pid #else - terminatePID pid + terminateProcessId pid #endif {- Windows locks a lock file that corresponds with the pid of the process. diff --git a/Utility/WinProcess.hs b/Utility/WinProcess.hs deleted file mode 100644 index cb9029874..000000000 --- a/Utility/WinProcess.hs +++ /dev/null @@ -1,15 +0,0 @@ -{- Windows processes - - - - Copyright 2014 Joey Hess <id@joeyh.name> - - - - License: BSD-2-clause - -} - -module Utility.WinProcess where - -import Utility.PID -import System.IO - -terminatePID :: PID -> IO () -terminatePID p = hPutStrLn stderr "terminating processes on windows is not currently working" - |