aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-05-19 10:25:40 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-05-19 10:25:40 -0400
commit11a477157f5de78edc0d0135d6e8e97c7f8645b7 (patch)
treed101e61a1e4aca0c808da7263bdc2128a948f623
parente0666acd95f749b9512e3f365d0bd287acc34978 (diff)
fix build failure w/o concurrent-output
Also removed warning on old version, since the autobuilder highlights warnings as errors and this is too minor for that.
-rw-r--r--Messages/Concurrent.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Messages/Concurrent.hs b/Messages/Concurrent.hs
index 86a58f768..18d89e6a2 100644
--- a/Messages/Concurrent.hs
+++ b/Messages/Concurrent.hs
@@ -144,6 +144,7 @@ concurrentOutputSupported = return False
- the regions will not be hidden, but the action still runs, garbling the
- display. -}
hideRegionsWhile :: Annex a -> Annex a
+#ifdef WITH_CONCURRENTOUTPUT
#if MIN_VERSION_concurrent_output(1,9,0)
hideRegionsWhile a = bracketIO setup cleanup go
where
@@ -153,8 +154,7 @@ hideRegionsWhile a = bracketIO setup cleanup go
liftIO $ hFlush stdout
a
#else
-#ifdef WITH_CONCURRENTOUTPUT
-#warning Building with concurrent-output older than 1.9.0 so expect some display glitches when password prompts occur in concurrent mode
-#endif
+hideRegionsWhile = id
+#else
hideRegionsWhile = id
#endif