mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "Revert "remove dep on Win32-extras""

Browse source 
This reverts commit d18bc52caf.
This commit is contained in:
Joey Hess 2017-11-13 12:55:23 -04:00
parent ff3312d708
commit 1bd956bed4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Utility/PID.hs
View file

@ -13,8 +13,7 @@ module Utility.PID where
import System.Posix.Types (ProcessID) import System.Posix.Types (ProcessID)
import System.Posix.Process (getProcessID) import System.Posix.Process (getProcessID)
#else #else
import System.Win32.Process (ProcessId) import System.Win32.Process (ProcessId, getCurrentProcessId)
import System.Win32.Process.Current (getCurrentProcessId)
#endif #endif
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS

1
git-annex.cabal
View file

@ -382,7 +382,6 @@ Executable git-annex
if (os(windows)) if (os(windows))
Build-Depends: Build-Depends:
Win32 (>= 2.6.1.0), Win32 (>= 2.6.1.0),
Win32-extras,
unix-compat (>= 0.5), unix-compat (>= 0.5),
setenv, setenv,
process (>= 1.6.2.0) process (>= 1.6.2.0)