diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-15 15:27:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-15 15:29:41 -0400 |
| commit | 7eb83f6f712606d13b4083affff19126d9fb0f75 (patch) | |
| tree | b687d51c3960bbc26ff2b1f282899479261a967c /Messages | |
| parent | a84433f0b887f934043f7ac65ec5fc4614cb22f7 (diff) | |
fix build w/o concurrent-output
Diffstat (limited to 'Messages')
| -rw-r--r-- | Messages/Concurrent.hs | 4 | ||||
| -rw-r--r-- | Messages/Progress.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Messages/Concurrent.hs b/Messages/Concurrent.hs index 565319329..0e39114dd 100644 --- a/Messages/Concurrent.hs +++ b/Messages/Concurrent.hs @@ -11,10 +11,10 @@ module Messages.Concurrent where import Annex +import Types.Messages #ifdef WITH_CONCURRENTOUTPUT import Common -import Types.Messages import qualified System.Console.Concurrent as Console import qualified System.Console.Regions as Regions import Control.Concurrent.STM @@ -32,8 +32,8 @@ import GHC.IO.Encoding - instead. -} concurrentMessage :: OutputType -> Bool -> String -> Annex () -> Annex () -#ifdef WITH_CONCURRENTOUTPUT concurrentMessage o iserror msg fallback +#ifdef WITH_CONCURRENTOUTPUT | concurrentOutputEnabled o = go =<< consoleRegion <$> Annex.getState Annex.output #endif diff --git a/Messages/Progress.hs b/Messages/Progress.hs index 6bbf43f4c..1583d922b 100644 --- a/Messages/Progress.hs +++ b/Messages/Progress.hs @@ -45,8 +45,8 @@ metered combinemeterupdate key a = case keySize key of maybe noop (\m -> m n) combinemeterupdate liftIO $ clearMeter stdout meter return r -#if WITH_CONCURRENTOUTPUT go size o@(ConcurrentOutput {}) +#if WITH_CONCURRENTOUTPUT | concurrentOutputEnabled o = withProgressRegion $ \r -> do (progress, meter) <- mkmeter size a $ \n -> liftIO $ do |