summaryrefslogtreecommitdiff
path: root/src/System/Console/Concurrent.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-06 12:46:52 -0400
committerJoey Hess2015-11-06 12:46:52 -0400
commitd50aa85052b1f35021072ea95bc51b5c46c797b0 (patch)
treebc7e94f6bc142959dbef097b86f9efa95bedaaec /src/System/Console/Concurrent.hs
parent8ed7d71bda9efd6af870ac926d2d907f71168798 (diff)
merge from concurrent-output
Diffstat (limited to 'src/System/Console/Concurrent.hs')
-rw-r--r--src/System/Console/Concurrent.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/System/Console/Concurrent.hs b/src/System/Console/Concurrent.hs
index efbfaa15..12447637 100644
--- a/src/System/Console/Concurrent.hs
+++ b/src/System/Console/Concurrent.hs
@@ -14,13 +14,18 @@
-- > `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,