summaryrefslogtreecommitdiff
path: root/src/System/Console/Concurrent.hs
diff options
context:
space:
mode:
authorJoey Hess2020-06-10 17:07:43 -0400
committerJoey Hess2020-06-10 17:07:43 -0400
commit162e1d4e82e24f0fe3e2bd3114e4366ddb1062c0 (patch)
treefa917a670e160601b536be0a79f3f3ac61c6d03a /src/System/Console/Concurrent.hs
parente6d4139e15b3a52f4a60178bb7d15ba96f191340 (diff)
merge from concurrent-output
This includes e6d4139e15b3a52f4a60178bb7d15ba96f191340 which I hope fixes the reversion that has been plaguing propellor when trying to use more recent versions of concurrent-output. Embedding it will let me test, and also it will be years until that fix is widely enough available to depend on it.
Diffstat (limited to 'src/System/Console/Concurrent.hs')
-rw-r--r--src/System/Console/Concurrent.hs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/System/Console/Concurrent.hs b/src/System/Console/Concurrent.hs
index 12447637..8ab73c3d 100644
--- a/src/System/Console/Concurrent.hs
+++ b/src/System/Console/Concurrent.hs
@@ -7,29 +7,25 @@
-- > import Control.Concurrent.Async
-- > import System.Console.Concurrent
-- >
--- > main = withConcurrentOutput $
+-- > main = withConcurrentOutput $ do
-- > outputConcurrent "washed the car\n"
-- > `concurrently`
-- > outputConcurrent "walked the dog\n"
-- > `concurrently`
-- > createProcessConcurrent (proc "ls" [])
-{-# LANGUAGE CPP #-}
-
module System.Console.Concurrent (
-- * Concurrent output
withConcurrentOutput,
Outputable(..),
outputConcurrent,
errorConcurrent,
- ConcurrentProcessHandle,
-#ifndef mingw32_HOST_OS
createProcessConcurrent,
-#endif
- waitForProcessConcurrent,
createProcessForeground,
flushConcurrentOutput,
lockOutput,
+ ConcurrentProcessHandle,
+ waitForProcessConcurrent,
-- * Low level access to the output buffer
OutputBuffer,
StdHandle(..),