projects
/
lsp-test.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02c7c7c
)
Fix conditionals for process-1.6.3.0
author
jneira
<atreyu.bbb@gmail.com>
Sat, 20 Jul 2019 23:35:03 +0000
(
01:35
+0200)
committer
jneira
<atreyu.bbb@gmail.com>
Sat, 20 Jul 2019 23:35:03 +0000
(
01:35
+0200)
src/Language/Haskell/LSP/Test/Compat.hs
patch
|
blob
|
history
diff --git
a/src/Language/Haskell/LSP/Test/Compat.hs
b/src/Language/Haskell/LSP/Test/Compat.hs
index ddf4a7893e9c4a635a007b91981e6077bfa6c86b..a68f74158bb95baa85d5965556eecaf5689c1044 100644
(file)
--- 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)
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, 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
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 ()
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
cleanupProcess = System.Process.cleanupProcess
#else
cleanupProcess (mb_stdin, mb_stdout, mb_stderr, ph) = do