Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #11 from shelarcy/WXWIDGETS_2_8

Fix building WXWIDGETS_2_8 with GHC 7.6.1
  • Loading branch information...
commit 4a204f8917547e446ad6f41ed16342a6b5b99452 2 parents d2646f7 + a00bf24
@jodonoghue authored
View
1  wxcore/src/haskell/Graphics/UI/WXCore/Events.hs
@@ -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
View
2  wxcore/wxcore.cabal
@@ -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,
View
1  wxdirect/src/CompileClasses.hs
@@ -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
View
3  wxdirect/src/ParseEiffel.hs
@@ -20,6 +20,7 @@ import Text.ParserCombinators.Parsec.Language
import Types
import System.Environment ( getEnv )
+import System.IO.Error (catchIOError)
{-----------------------------------------------------------------------------------------
Testing
@@ -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"]
View
4 wxdirect/wxdirect.cabal
@@ -1,5 +1,5 @@
name: wxdirect
-version: 0.13.1.2
+version: 0.13.1.3
license: BSD3
license-file: LICENSE
author: Daan Leijen
@@ -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,
Please sign in to comment.
Something went wrong with that request. Please try again.