From: jneira Date: Sat, 20 Jul 2019 23:35:03 +0000 (+0200) Subject: Fix conditionals for process-1.6.3.0 X-Git-Tag: 0.6.1.0~2^2~7 X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=c20539b56bdb7ae9b0c01a30e70215a6aeaa7bd1 Fix conditionals for process-1.6.3.0 --- diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs index ddf4a78..a68f741 100644 --- a/src/Language/Haskell/LSP/Test/Compat.hs +++ b/src/Language/Haskell/LSP/Test/Compat.hs @@ -9,9 +9,14 @@ import Data.Maybe import System.IO #if MIN_VERSION_process(1,6,3) +# if MIN_VERSION_process(1,6,4) import System.Process hiding (getPid, cleanupProcess) import qualified System.Process (getPid, cleanupProcess) # else +import System.Process hiding (getPid) +import qualified System.Process (getPid) +# endif +#else import System.Process import System.Process.Internals import Control.Concurrent.MVar @@ -59,7 +64,7 @@ cleanupRunningProcess p@(_, _, _, ph) = getProcessExitCode ph >>= maybe (cleanupProcess p) (const $ return ()) cleanupProcess :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO () -#if MIN_VERSION_process(1,6,3) +#if MIN_VERSION_process(1,6,4) cleanupProcess = System.Process.cleanupProcess #else cleanupProcess (mb_stdin, mb_stdout, mb_stderr, ph) = do