[PATCH master] Change the instance definition of MetadMonadInt to

['BSRK Aditya' via ganeti-devel]

also support monad-control 1.0.0.x

Signed-off-by: BSRK Aditya <b...@google.com>
---
 src/Ganeti/Metad/ConfigCore.hs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Ganeti/Metad/ConfigCore.hs b/src/Ganeti/Metad/ConfigCore.hs
index 6d3295e..41120fd 100644
--- a/src/Ganeti/Metad/ConfigCore.hs
+++ b/src/Ganeti/Metad/ConfigCore.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TupleSections, TemplateHaskell,
+{-# LANGUAGE TupleSections, TemplateHaskell, CPP, UndecidableInstances,
     MultiParamTypeClasses, TypeFamilies, GeneralizedNewtypeDeriving #-}
 {-| Functions of the metadata daemon exported for RPC
 
@@ -37,7 +37,6 @@ module Ganeti.Metad.ConfigCore where
 
 import Control.Applicative
 import Control.Concurrent.MVar.Lifted
-import Control.Monad
 import Control.Monad.Base
 import Control.Monad.IO.Class
 import Control.Monad.Reader
@@ -69,11 +68,19 @@ newtype MetadMonadInt a = MetadMonadInt
            , L.MonadLog )
 
 instance MonadBaseControl IO MetadMonadInt where
+#if MIN_VERSION_monad_control(1,0,0)
+-- Needs Undecidable instances
+  type StM MetadMonadInt b = StM MetadMonadIntType b
+  liftBaseWith f = MetadMonadInt . liftBaseWith
+                   $ \r -> f (r . getMetadMonadInt)
+  restoreM = MetadMonadInt . restoreM
+#else
   newtype StM MetadMonadInt b = StMMetadMonadInt
     { runStMMetadMonadInt :: StM MetadMonadIntType b }
   liftBaseWith f = MetadMonadInt . liftBaseWith
                    $ \r -> f (liftM StMMetadMonadInt . r . getMetadMonadInt)
   restoreM = MetadMonadInt . restoreM . runStMMetadMonadInt
+#endif
 
 -- | Runs the internal part of the MetadMonad monad on a given daemon
 -- handle.
-- 
2.2.0.rc0.207.ga3a616c