Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Fixed build with base-4.6
  • Loading branch information...
commit 2c4473255600d874c8b88bfb3ce2e6a202e1f227 2 parents 8e7751c + 5b00e58
@phonohawk authored
Showing with 7 additions and 1 deletion.
  1. +2 −0  OpenSSL/PEM.hsc
  2. +5 −1 OpenSSL/Session.hsc
View
2  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
View
6 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
Please sign in to comment.
Something went wrong with that request. Please try again.