Skip to content
Snippets Groups Projects
Commit b9c95ca5 authored by judah's avatar judah
Browse files

Make haskeline build on ghc-6.6.1.

parent 447741d5
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,12 @@ module System.Console.Haskeline.Backend.IConv(
import Foreign.C
import Foreign
import Data.ByteString (ByteString, useAsCStringLen, append)
-- TODO: Base or Internal, depending on whether base>=3.
#ifdef OLD_BASE
import Data.ByteString.Base (createAndTrim')
#else
import Data.ByteString.Internal (createAndTrim')
#endif
import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as UTF8
......
......@@ -41,7 +41,7 @@ import GHC.Handle (withHandle_)
-------------------
-- Window size
foreign import ccall ioctl :: CInt -> CULong -> Ptr a -> IO CInt
foreign import ccall ioctl :: FD -> CULong -> Ptr a -> IO CInt
posixLayouts :: Handle -> [IO (Maybe Layout)]
posixLayouts h = [ioctlLayout h, envLayout]
......
......@@ -31,11 +31,12 @@ flag terminfo
Library
if flag(old-base)
Build-depends: base < 3
Build-depends: base == 2.*
cpp-options: -DOLD_BASE
else
Build-depends: base>=3 && <5 , containers>=0.1, directory>=1.0
Build-depends: base>=3 && <5 , containers>=0.1, directory>=1.0,
bytestring==0.9.*
Build-depends: filepath==1.1.*, mtl==1.1.*,
bytestring==0.9.*,
utf8-string==0.3.* && >=0.3.1.1,
extensible-exceptions==0.1.* && >=0.1.1.0
Extensions: ForeignFunctionInterface, RankNTypes, FlexibleInstances,
......@@ -76,8 +77,8 @@ Library
install-includes: win_console.h
cpp-options: -DMINGW
} else {
Build-depends: unix>=2.2 && < 2.4
-- unix-2.3 doesn't build on ghc-6.8.1
Build-depends: unix>=2.1 && < 2.4
-- unix-2.3 doesn't build on ghc-6.8.1 or earlier
-- temporary hack: some OSes provide iconv in (g)libc, and
-- some provide it as a separate libiconv. It would be
-- better if we could detect this automatically, though.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment