diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-13 12:55:23 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-13 12:55:23 -0400 |
| commit | 788488be0b3af819c4e78b8b9d371e17e0f967a1 (patch) | |
| tree | 95394660d99a540161bfe1c116c8ef4324a44d5d | |
| parent | e112483e7f6a36d3bf24fdc73fecae96e064777c (diff) | |
Revert "Revert "remove dep on Win32-extras""
This reverts commit ce44f20f128ad8740b9098ad86ed70156919cd43.
| -rw-r--r-- | Utility/PID.hs | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Utility/PID.hs b/Utility/PID.hs index ac63045a7..f5f8aa873 100644 --- a/Utility/PID.hs +++ b/Utility/PID.hs @@ -13,8 +13,7 @@ module Utility.PID where import System.Posix.Types (ProcessID) import System.Posix.Process (getProcessID) #else -import System.Win32.Process (ProcessId) -import System.Win32.Process.Current (getCurrentProcessId) +import System.Win32.Process (ProcessId, getCurrentProcessId) #endif #ifndef mingw32_HOST_OS diff --git a/git-annex.cabal b/git-annex.cabal index a73d55d15..8f963b15e 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -382,7 +382,6 @@ Executable git-annex if (os(windows)) Build-Depends: Win32 (>= 2.6.1.0), - Win32-extras, unix-compat (>= 0.5), setenv, process (>= 1.6.2.0) |