e0b4b23 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Merge pull request #87 from basvandijk/fix-warnings

Fix warnings

commite0b4b231e0bfb9542675a19e3b4d0931c70ed0cc authorLeon P Smith <leon@melding-monads.com> dateMon 21 Oct 2013, 14:28 (13 years ago) parentc40fa72 6cde512

2 files changed+4−3

compare with master

unifiedsplit

src/Database/PostgreSQL/Simple/HStore/Implementation.hs+4−2 src/Database/PostgreSQL/Simple/Transaction.hs−1

src/Database/PostgreSQL/Simple/HStore/Implementation.hs+4−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE ViewPatterns, DeriveDataTypeable, GeneralizedNewtypeDeriving #-}

1+{-# LANGUAGE CPP, ViewPatterns, DeriveDataTypeable, GeneralizedNewtypeDeriving #-}

33------------------------------------------------------------------------------

44-- |

@@ -23,7 +23,9 @@ import qualified Data.Attoparsec.ByteString.Char8 as P (isSpace_w8)

2323import qualified Data.ByteString as BS

2424import Data.ByteString.Internal (c2w, w2c)

2525import qualified Data.ByteString.Lazy as BL

26−import qualified Data.ByteString.Lazy.Internal as BL

26+#if !MIN_VERSION_bytestring(0,10,0)

27+import qualified Data.ByteString.Lazy.Internal as BL (foldrChunks)

28+#endif

2729import Data.Map(Map)

2830import qualified Data.Map as Map

2931import Data.Text(Text)

src/Database/PostgreSQL/Simple/Transaction.hs−1

@@ -36,7 +36,6 @@ module Database.PostgreSQL.Simple.Transaction

3636 ) where

3737

3838import qualified Control.Exception as E

39−import Data.ByteString (ByteString)

4039import qualified Data.ByteString as B

4140import Database.PostgreSQL.Simple.Internal

4241import Database.PostgreSQL.Simple.Types