From: jneira <atreyu.bbb@gmail.com>
Date: Sun, 21 Jul 2019 11:40:19 +0000 (+0200)
Subject: Merge branch 'fix-win-tests' of https://github.com/jneira/lsp-test into fix-win-tests
X-Git-Tag: 0.6.1.0~2^2~6
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=f14d6c859ce68ec2d73503cbe03e205108df444d;hp=f0a961503e19c2d281c3d6319df1096f5bf6cfcf

Merge branch 'fix-win-tests' of https://github.com/jneira/lsp-test into fix-win-tests
---

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