From 98938f15c39baaaff52d70606dfba49c4bb854b5 Mon Sep 17 00:00:00 2001 From: jao Date: Sat, 11 Oct 2014 20:21:38 +0200 Subject: Compatibility with mtl 2.1 Thanks to Apollon Oikonomopoulos!! --- src/Bitmap.hs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/Bitmap.hs') diff --git a/src/Bitmap.hs b/src/Bitmap.hs index 63baf6a..ec99ad8 100644 --- a/src/Bitmap.hs +++ b/src/Bitmap.hs @@ -18,7 +18,6 @@ module Bitmap import Control.Applicative((<|>)) import Control.Monad -import Control.Monad.Except(MonadError(..), runExceptT) import Control.Monad.Trans(MonadIO(..)) import Data.Map hiding (foldr, map, filter) import Graphics.X11.Xlib @@ -33,6 +32,18 @@ import Actions (Action) import XPMFile(readXPMFile) #endif +#if MIN_VERSION_mtl(2, 2, 1) +import Control.Monad.Except(MonadError(..), runExceptT) + +#else +import Control.Monad.Error(MonadError(..)) +import Control.Monad.Trans.Error(ErrorT, runErrorT) + +runExceptT :: ErrorT e m a -> m (Either e a) +runExceptT = runErrorT + +#endif + data BitmapType = Mono Pixel | Poly data Bitmap = Bitmap { width :: Dimension -- cgit v1.2.3