Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix building WXWIDGETS_2_8 with GHC 7.6.1 #11

Merged
merged 3 commits into from Apr 2, 2013
Merged

Fix building WXWIDGETS_2_8 with GHC 7.6.1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5149eb3
Fix building with GHC 7.6.1
shelarcy Sep 30, 2012
7a22efc
Fix building wx-2.8 with GHC 7.6.x
shelarcy Sep 30, 2012
a00bf24
Bump wxdirect version number to 0.13.1.3
shelarcy Sep 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions wxcore/src/haskell/Graphics/UI/WXCore/Events.hs
View file
Open in desktop
Expand Up @@ -237,6 +237,7 @@ import System.Environment( getProgName, getArgs )
import Foreign.StablePtr
import Foreign.Ptr
import Foreign.C.String
import Foreign.C.Types
import Foreign.Marshal.Alloc
import Foreign.Marshal.Array
import Foreign.Marshal.Utils
Expand Down
2 changes: 1 addition & 1 deletion wxcore/wxcore.cabal
View file
Open in desktop
Expand Up @@ -209,7 +209,7 @@ library
build-depends:
array >= 0.2 && < 0.5,
base >= 4 && < 5,
containers >= 0.2 && < 0.5
containers >= 0.2 && < 0.6
else
build-depends:
array >= 0.1 && < 0.3,
Expand Down
1 change: 1 addition & 0 deletions wxdirect/src/CompileClasses.hs
View file
Open in desktop
Expand Up @@ -100,6 +100,7 @@ compileClassesFile showIgnore moduleRoot moduleClassTypesName moduleName outputF
, ""
, "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
, "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
, "import Foreign.C.Types"
, "import System.IO.Unsafe( unsafePerformIO )"
, "import " ++ moduleRoot ++ "WxcTypes"
, "import " ++ moduleRoot ++ moduleClassTypesName
Expand Down
3 changes: 2 additions & 1 deletion wxdirect/src/ParseEiffel.hs
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import Text.ParserCombinators.Parsec.Language
import Types

import System.Environment ( getEnv )
import System.IO.Error (catchIOError)

{-----------------------------------------------------------------------------------------
Testing
Expand All @@ -33,7 +34,7 @@ test

getDefaultEiffelFiles :: IO [FilePath]
getDefaultEiffelFiles
= do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
= do wxwin <- getEnv "WXWIN" `catchIOError` \err -> return ""
return [wxwin ++ "/wxc/include/wxc_defs.e"
,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]

Expand Down
4 changes: 2 additions & 2 deletions wxdirect/wxdirect.cabal
View file
Open in desktop
@@ -1,5 +1,5 @@
name: wxdirect
version: 0.13.1.2
version: 0.13.1.3
license: BSD3
license-file: LICENSE
author: Daan Leijen
Expand Down Expand Up @@ -68,7 +68,7 @@ executable wxdirect
if flag(splitBase)
build-depends:
base >= 4 && < 5,
containers >= 0.2 && < 0.5
containers >= 0.2 && < 0.6
else
build-depends:
base >= 3 && < 4,
Expand Down