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 /Assistant | |
| 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 'Assistant')
| -rw-r--r-- | Assistant/Restart.hs | 4 | ||||
| -rw-r--r-- | Assistant/TransferSlots.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Restart.hs b/Assistant/Restart.hs index be1b21392..ce180b370 100644 --- a/Assistant/Restart.hs +++ b/Assistant/Restart.hs @@ -27,7 +27,7 @@ import Control.Concurrent #ifndef mingw32_HOST_OS import System.Posix (signalProcess, sigTERM) #else -import Utility.WinProcess +import System.Win32.Process (terminateProcessId) #endif import Network.URI @@ -59,7 +59,7 @@ terminateSelf = #ifndef mingw32_HOST_OS signalProcess sigTERM =<< getPID #else - terminatePID =<< getPID + terminateProcessId =<< getPID #endif runRestart :: Assistant URLString diff --git a/Assistant/TransferSlots.hs b/Assistant/TransferSlots.hs index c80cf880a..74453004d 100644 --- a/Assistant/TransferSlots.hs +++ b/Assistant/TransferSlots.hs @@ -41,7 +41,7 @@ import qualified Control.Concurrent.MSemN as MSemN import System.Posix.Process (getProcessGroupIDOf) import System.Posix.Signals (signalProcessGroup, sigTERM, sigKILL) #else -import Utility.WinProcess +import System.Win32.Process (terminateProcessId) #endif type TransferGenerator = Assistant (Maybe (Transfer, TransferInfo, Transferrer -> Assistant ())) @@ -270,7 +270,7 @@ cancelTransfer pause t = do threadDelay 50000 -- 0.05 second grace period signal sigKILL #else - terminatePID pid + terminateProcessId pid #endif {- Start or resume a transfer. -} |