Avoid warnings

codedownio · Mar 20, 2018 · 9376bb6 · 9376bb6
1 parent 54b93fb
commit 9376bb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Database/MySQL/Base/Types.hsc b/Database/MySQL/Base/Types.hsc
@@ -234,6 +234,7 @@ instance Storable Field where
     sizeOf _    = #{size MYSQL_FIELD}
     alignment _ = alignment (undefined :: Ptr CChar)
     peek = peekField
+    poke _ _ = return ()   -- Unused, but define it to avoid a warning
 
 type Seconds = Word
 

diff --git a/Setup.hs b/Setup.hs
@@ -57,8 +57,13 @@ mysqlConfigProgram = (simpleProgram "mysql_config") {
 
 mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
 mysqlBuildInfo lbi = do
+#if MIN_VERSION_Cabal(2,0,0)
+  let mysqlConfig = fmap words . getDbProgramOutput normal
+                    mysqlConfigProgram (withPrograms lbi)
+#else
   let mysqlConfig = fmap words . rawSystemProgramStdoutConf normal
                     mysqlConfigProgram (withPrograms lbi)
+#endif
 
   include <- mysqlConfig ["--include"]
   libs <- mysqlConfig ["--libs"]