Merge pull request #15 from mvv/base-4.6-fix

Fixed build with base-4.6
depressed-pho · Jul 21, 2012 · 2c44732 · 2c44732
2 parents 8e7751c + 5b00e58
commit 2c44732
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/OpenSSL/PEM.hsc b/OpenSSL/PEM.hsc
@@ -55,7 +55,9 @@ import           OpenSSL.Utils
 import           OpenSSL.X509
 import           OpenSSL.X509.Request
 import           OpenSSL.X509.Revocation
+#if !MIN_VERSION_base(4,6,0)
 import           Prelude hiding (catch)
+#endif
 import           System.IO
 
 

diff --git a/OpenSSL/Session.hsc b/OpenSSL/Session.hsc
@@ -58,7 +58,11 @@ module OpenSSL.Session
 
 #include "openssl/ssl.h"
 
-import Prelude hiding (catch, read, ioError, mapM, mapM_)
+import Prelude hiding (
+#if !MIN_VERSION_base(4,6,0)
+  catch,
+#endif
+  read, ioError, mapM, mapM_)
 import Control.Concurrent (threadWaitWrite, threadWaitRead, runInBoundThread)
 import Control.Concurrent.QSem
 import Control.Exception