diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-03 10:51:20 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-03 14:36:34 +0100 |
| commit | 92566fab42924e6d991e608ec215c6eb9b52e0a9 (patch) | |
| tree | aaa84fb2d773fce6d85e118515392cbccc66b687 /dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch | |
| parent | 6f3a792aa51aa0c18c1ca3661e39d64488b1cff6 (diff) | |
| download | gentoo-92566fab42924e6d991e608ec215c6eb9b52e0a9.tar.gz gentoo-92566fab42924e6d991e608ec215c6eb9b52e0a9.tar.bz2 gentoo-92566fab42924e6d991e608ec215c6eb9b52e0a9.zip | |
dev-haskell/regex-posix: drop old
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch')
| -rw-r--r-- | dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch deleted file mode 100644 index dfdfa71522f5..000000000000 --- a/dev-haskell/regex-posix/files/regex-posix-0.95.1-control-exception.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/Text/Regex/Posix/Wrap.hsc b/Text/Regex/Posix/Wrap.hsc -index d27b756..a43bcc3 100644 ---- a/Text/Regex/Posix/Wrap.hsc -+++ b/Text/Regex/Posix/Wrap.hsc -@@ -102,7 +102,7 @@ module Text.Regex.Posix.Wrap( - -- string.h is needed for memset - - #include "myfree.h" -- -+ - #include "string.h" - - #ifndef _POSIX_C_SOURCE -@@ -131,10 +131,19 @@ import Foreign(Ptr, FunPtr, nullPtr, newForeignPtr, - addForeignPtrFinalizer, Storable(peekByteOff), allocaArray, - allocaBytes, withForeignPtr,ForeignPtr,plusPtr,peekElemOff) - import Foreign.Marshal.Alloc(mallocBytes) --import Foreign.C(CSize,CInt,CChar) -+import Foreign.C(CChar) -+#if __GLASGOW_HASKELL__ >= 703 -+import Foreign.C(CSize(CSize),CInt(CInt)) -+#else -+import Foreign.C(CSize,CInt) -+#endif - import Foreign.C.String(peekCAString, CString) - import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray) --import qualified System.IO.Error as IOERROR(try) -+-- deprecated: import qualified System.IO.Error as IOERROR(try) -+import qualified Control.Exception(try,IOException) -+ -+try :: IO a -> IO (Either Control.Exception.IOException a) -+try = Control.Exception.try - - type CRegex = () -- dummy regex_t used below to read out nsub value - -@@ -349,8 +358,10 @@ foreign import ccall unsafe "&myregfree" - foreign import ccall unsafe "regcomp" - c_regcomp :: Ptr CRegex -> CString -> CompOption -> IO ReturnCode - -+{- NOT USED - foreign import ccall unsafe "®free" - c_regfree :: FunPtr (Ptr CRegex -> IO ()) -+-} - - foreign import ccall unsafe "regexec" - c_regexec :: Ptr CRegex -> CString -> CSize -@@ -460,7 +471,7 @@ wrapError errCode regex_ptr = do - ---------- - wrapCompile flags e pattern = do - nullTest pattern "wrapCompile pattern" $ do -- e_regex_ptr <- IOERROR.try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr -+ e_regex_ptr <- try $ mallocBytes (#const sizeof(regex_t)) -- ioError called if nullPtr - case e_regex_ptr of - Left ioerror -> return (Left (retOk,"Text.Regex.Posix.Wrap.wrapCompile: IOError from mallocBytes(regex_t) : "++show ioerror)) - Right raw_regex_ptr -> do - |
