Skip to content
This repository
Browse code

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
Jeremy O'Donoghue authored
1  wxcore/src/haskell/Graphics/UI/WXCore/Events.hs
@@ -237,6 +237,7 @@ import System.Environment( getProgName, getArgs )
237 237
 import Foreign.StablePtr
238 238
 import Foreign.Ptr
239 239
 import Foreign.C.String
  240
+import Foreign.C.Types
240 241
 import Foreign.Marshal.Alloc
241 242
 import Foreign.Marshal.Array
242 243
 import Foreign.Marshal.Utils
2  wxcore/wxcore.cabal
@@ -209,7 +209,7 @@ library
209 209
     build-depends:
210 210
       array >= 0.2 && < 0.5,
211 211
       base >= 4 && < 5,
212  
-      containers >= 0.2 && < 0.5
  212
+      containers >= 0.2 && < 0.6
213 213
   else
214 214
     build-depends:
215 215
       array >= 0.1 && < 0.3,
1  wxdirect/src/CompileClasses.hs
@@ -100,6 +100,7 @@ compileClassesFile showIgnore moduleRoot moduleClassTypesName moduleName outputF
100 100
                                 , ""
101 101
                                 , "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
102 102
                                 , "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
  103
+                                , "import Foreign.C.Types"
103 104
                                 , "import System.IO.Unsafe( unsafePerformIO )"
104 105
                                 , "import " ++ moduleRoot ++ "WxcTypes"
105 106
                                 , "import " ++ moduleRoot ++ moduleClassTypesName
3  wxdirect/src/ParseEiffel.hs
@@ -20,6 +20,7 @@ import Text.ParserCombinators.Parsec.Language
20 20
 import Types
21 21
 
22 22
 import System.Environment ( getEnv )
  23
+import System.IO.Error    (catchIOError)
23 24
 
24 25
 {-----------------------------------------------------------------------------------------
25 26
    Testing
@@ -33,7 +34,7 @@ test
33 34
 
34 35
 getDefaultEiffelFiles :: IO [FilePath]
35 36
 getDefaultEiffelFiles
36  
-  = do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
  37
+  = do wxwin <- getEnv "WXWIN" `catchIOError` \err -> return ""
37 38
        return [wxwin ++ "/wxc/include/wxc_defs.e"
38 39
               ,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]
39 40
 
4  wxdirect/wxdirect.cabal
... ...
@@ -1,5 +1,5 @@
1 1
 name:         wxdirect
2  
-version:      0.13.1.2
  2
+version:      0.13.1.3
3 3
 license:      BSD3
4 4
 license-file: LICENSE
5 5
 author:       Daan Leijen
@@ -68,7 +68,7 @@ executable wxdirect
68 68
   if flag(splitBase)
69 69
     build-depends:
70 70
         base       >= 4     && < 5,
71  
-        containers >= 0.2   && < 0.5
  71
+        containers >= 0.2   && < 0.6
72 72
   else
73 73
     build-depends:
74 74
         base       >= 3     && < 4,

0 notes on commit 4a204f8

Please sign in to comment.
Something went wrong with that request. Please try again.