[commit: haskeline] master: Fix build on Windows with ghc>=7.4.1. (bb6e28e)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bb6e28ebc5f273acd387f816b13e79a1083eb1d3

>---------------------------------------------------------------

commit bb6e28ebc5f273acd387f816b13e79a1083eb1d3
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Thu Jul 26 05:33:24 2012 +0000

    Fix build on Windows with ghc>=7.4.1.

>---------------------------------------------------------------

 System/Console/Haskeline/Backend/Posix/Encoder.hs  |    2 +-
 System/Console/Haskeline/History.hs                |    2 +-
 .../Haskeline/{Backend/Posix => }/Recover.hs       |    2 +-
 haskeline.cabal                                    |    3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/System/Console/Haskeline/Backend/Posix/Encoder.hs b/System/Console/Haskeline/Backend/Posix/Encoder.hs
index 586ee23..beb85d6 100644
--- a/System/Console/Haskeline/Backend/Posix/Encoder.hs
+++ b/System/Console/Haskeline/Backend/Posix/Encoder.hs
@@ -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)
diff --git a/System/Console/Haskeline/History.hs b/System/Console/Haskeline/History.hs
index 4b82044..702699d 100644
--- a/System/Console/Haskeline/History.hs
+++ b/System/Console/Haskeline/History.hs
@@ -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
diff --git a/System/Console/Haskeline/Backend/Posix/Recover.hs b/System/Console/Haskeline/Recover.hs
similarity index 91%
rename from System/Console/Haskeline/Backend/Posix/Recover.hs
rename to System/Console/Haskeline/Recover.hs
index 7203461..5b3d6ae 100644
--- a/System/Console/Haskeline/Backend/Posix/Recover.hs
+++ b/System/Console/Haskeline/Recover.hs
@@ -1,4 +1,4 @@
-module System.Console.Haskeline.Backend.Posix.Recover where
+module System.Console.Haskeline.Recover where
 
 import GHC.IO.Encoding
 import GHC.IO.Encoding.Failure
diff --git a/haskeline.cabal b/haskeline.cabal
index f798bdc..05ac7f4 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -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