Skip to content

Commit

Permalink
Fix type mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
himura committed Aug 27, 2014
1 parent 1c1260c commit 8e8f088
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Web/Twitter/Conduit/Stream.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ import Web.Twitter.Conduit.Monad
import Web.Twitter.Types
import Web.Twitter.Conduit.Request

#if MIN_VERSION_conduit(1,0,16)
import Data.Conduit (($=+))
#endif
import qualified Data.Conduit as C
import qualified Data.Conduit.List as CL
import qualified Data.Conduit.Internal as CI
Expand All @@ -41,11 +38,13 @@ import qualified Data.ByteString as S
import Control.Monad.IO.Class
import Data.Aeson

#if !MIN_VERSION_conduit(1,0,16)
#if MIN_VERSION_conduit(1,0,16)
($=+) :: MonadIO m
=> CI.ResumableSource m a
-> CI.Conduit a m o
-> m (CI.ResumableSource m o)
($=+) = (return .) . (C.$=+)
#else
rsrc $=+ cndt = do
(src, finalizer) <- C.unwrapResumable rsrc
return $ CI.ResumableSource (src C.$= cndt) finalizer
Expand Down

0 comments on commit 8e8f088

Please sign in to comment.