Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
haskeline
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sven Tennie
haskeline
Commits
b9c95ca5
Commit
b9c95ca5
authored
16 years ago
by
judah
Browse files
Options
Downloads
Patches
Plain Diff
Make haskeline build on ghc-6.6.1.
parent
447741d5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
System/Console/Haskeline/Backend/IConv.hsc
+5
-0
5 additions, 0 deletions
System/Console/Haskeline/Backend/IConv.hsc
System/Console/Haskeline/Backend/Posix.hsc
+1
-1
1 addition, 1 deletion
System/Console/Haskeline/Backend/Posix.hsc
haskeline.cabal
+6
-5
6 additions, 5 deletions
haskeline.cabal
with
12 additions
and
6 deletions
System/Console/Haskeline/Backend/IConv.hsc
+
5
−
0
View file @
b9c95ca5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
System/Console/Haskeline/Backend/Posix.hsc
+
1
−
1
View file @
b9c95ca5
...
...
@@ -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]
...
...
This diff is collapsed.
Click to expand it.
haskeline.cabal
+
6
−
5
View file @
b9c95ca5
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment