Commit bb6e28eb authored by judah's avatar judah
Browse files

Fix build on Windows with ghc>=7.4.1.

parent 96db0c83
......@@ -33,7 +33,7 @@ import qualified System.Console.Terminfo.Base as Terminfo
-- Way-dependent imports
#ifdef USE_GHC_ENCODINGS
import GHC.IO.Encoding (initLocaleEncoding)
import System.Console.Haskeline.Backend.Posix.Recover
import System.Console.Haskeline.Recover
#else
import System.Console.Haskeline.Backend.Posix.IConv
import Data.ByteString (ByteString)
......
......@@ -34,7 +34,7 @@ import System.Directory(doesFileExist)
#ifdef USE_GHC_ENCODINGS
import qualified System.IO as IO
import System.Console.Haskeline.Backend.Posix.Recover
import System.Console.Haskeline.Recover
#else
import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as UTF8
......
module System.Console.Haskeline.Backend.Posix.Recover where
module System.Console.Haskeline.Recover where
import GHC.IO.Encoding
import GHC.IO.Encoding.Failure
......
......@@ -99,6 +99,7 @@ Library
-- due to GHC bug #5436 which wasn't fixed until 7.4.1
if !flag(legacy-encoding) && impl(ghc>=7.4) {
cpp-options: -DUSE_GHC_ENCODINGS
Other-modules: System.Console.Haskeline.Recover
} else {
Build-depends: utf8-string==0.3.* && >=0.3.6
}
......@@ -118,8 +119,6 @@ Library
includes: h_iconv.h
install-includes: h_iconv.h
Other-modules: System.Console.Haskeline.Backend.Posix.IConv
} else {
Other-modules: System.Console.Haskeline.Backend.Posix.Recover
}
Other-modules:
System.Console.Haskeline.Backend.Posix
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment