diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-25 19:46:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-25 19:46:28 -0400 |
| commit | b06bb6a14ed99c273b1909d2328937595e3b3504 (patch) | |
| tree | 2a2d4a47710c38e04b58afcbd08009eecb5d331b | |
| parent | 48503d747011befb10f01a1ee4097ddc93103d20 (diff) | |
terminateProcessId renamed
win32 upstream suggested a better name
| -rw-r--r-- | Assistant/Restart.hs | 4 | ||||
| -rw-r--r-- | Assistant/TransferSlots.hs | 4 | ||||
| -rw-r--r-- | Utility/Daemon.hs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Assistant/Restart.hs b/Assistant/Restart.hs index ce180b370..7d6575995 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 System.Win32.Process (terminateProcessId) +import System.Win32.Process (terminateProcessById) #endif import Network.URI @@ -59,7 +59,7 @@ terminateSelf = #ifndef mingw32_HOST_OS signalProcess sigTERM =<< getPID #else - terminateProcessId =<< getPID + terminateProcessById =<< getPID #endif runRestart :: Assistant URLString diff --git a/Assistant/TransferSlots.hs b/Assistant/TransferSlots.hs index 74453004d..c0d464e41 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 System.Win32.Process (terminateProcessId) +import System.Win32.Process (terminateProcessById) #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 - terminateProcessId pid + terminateProcessById pid #endif {- Start or resume a transfer. -} diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 2cb0864d2..398e6d9e7 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 System.Win32.Process (terminateProcessId) +import System.Win32.Process (terminateProcessById) import Utility.LockFile #endif @@ -162,7 +162,7 @@ stopDaemon pidfile = go =<< checkDaemon pidfile #ifndef mingw32_HOST_OS signalProcess sigTERM pid #else - terminateProcessId pid + terminateProcessById pid #endif {- Windows locks a lock file that corresponds with the pid of the process. |