on master help sign in
warning fixup again
commit93c784d69247d4edadaa65274065e9fb2cc18068 authorCorey O'Connor <coreyoconnor@gmail.com> dateThu 7 Aug 2014, 21:24 (12 years ago) parent907b96a
3 files changed+11−1
CHANGELOG+1 src/Graphics/Vty/Config.hs+8−1 src/Graphics/Vty/PictureToSpans.hs+2
CHANGELOG+1
@@ -10,6 +10,7 @@
1010 - updates to vty-rogue from jtdaugherty. Thanks!
1111 - the oldest version of GHC tested to support vty is 7.6.2.
1212 - the oldest version of GHC that vty compiles under is 7.4.2
13+
13145.1.4
1415 - merged https://github.com/coreyoconnor/vty/pull/51 thanks trofi!
1516
src/Graphics/Vty/Config.hs+8−1
@@ -66,7 +66,7 @@
6666--
6767module Graphics.Vty.Config where
6868
69−#if __GLASGOW_HASKELL__ < 704
69+#if __GLASGOW_HASKELL__ > 704
7070import Prelude
7171#else
7272import Prelude hiding (catch)
@@ -74,8 +74,13 @@ import Prelude hiding (catch)
7474
7575import Control.Applicative hiding (many)
7676
77+#if __GLASGOW_HASKELL__ < 708
7778import Control.Exception (tryJust, catch, IOException)
7879import Control.Monad (void, guard)
80+#else
81+import Control.Exception (catch, IOException)
82+import Control.Monad (void)
83+#endif
7984import Control.Monad.Trans.Class
8085import Control.Monad.Trans.Writer
8186
@@ -86,7 +91,9 @@ import Data.Monoid
8691import Graphics.Vty.Input.Events
8792
8893import System.Directory (getAppUserDataDirectory)
94+#if __GLASGOW_HASKELL__ < 708
8995import System.IO.Error (isDoesNotExistError)
96+#endif
9097import System.Posix.Env (getEnv)
9198import System.Posix.IO (stdInput, stdOutput)
9299import System.Posix.Types (Fd(..))
src/Graphics/Vty/PictureToSpans.hs+2
@@ -22,6 +22,8 @@ import Control.Monad.State.Strict hiding ( state )
2222
2323#if __GLASGOW_HASKELL__ < 708
2424import Control.Monad.ST.Strict hiding ( unsafeIOToST )
25+#else
26+import Control.Monad.ST.Strict hiding ( unsafeIOToST )
2527#endif
2628
2729import qualified Data.Vector as Vector hiding ( take, replicate )