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

Fix Windows build to work with ghc 7.10

Browse source 
It was failing at link time, some problem with terminatePID.
Re-implemented that to not use a C wrapper function, which cleared up the
problem. Removed old EvilLinker hack with must have been related to the
same problem.

Note that I have not tested this with older ghc's. In
f11f7520b5 I mention having tried this
approach before, and getting segfaults.. So, who knows. It seems to work
fine with ghc 7.10 at least.
This commit is contained in:
Joey Hess 2015-09-01 14:37:02 -07:00
parent 4ee9cb9c6d
commit 86e638567a
5 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Utility/WinProcess.hs
View file

@ -11,5 +11,18 @@ module Utility.WinProcess where
import Utility.PID
foreign import ccall unsafe "terminatepid"
terminatePID :: PID -> IO ()
import System.Win32.Process
import Control.Exception (bracket)
import Control.Monad
terminatePID :: PID -> IO ()
terminatePID p = bracket
(openProcess pROCESS_TERMINATE False p)
(void . c_closeProcess)
(\h -> void $ c_TerminateProcess h 1)
foreign import ccall unsafe "windows.h TerminateProcess"
c_TerminateProcess :: ProcessHandle -> Int -> IO Int
foreign import ccall unsafe "windows.h CloseHandle"
c_closeProcess :: ProcessHandle -> IO Bool