Commit b8e314a7 authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Merge branch 'sol-fix-getgrgid_r-v3' of https://github.com/kgardas/unix into...

Merge branch 'sol-fix-getgrgid_r-v3' of https://github.com/kgardas/unix into kgardas-sol-fix-getgrgid_r-v3

Conflicts:
	changelog.md
parents 8afe57ff 3c28bc83
#ifdef __GLASGOW_HASKELL__
{-# LANGUAGE Trustworthy #-}
{-# LANGUAGE Trustworthy, CApiFFI #-}
#endif
-----------------------------------------------------------------------------
-- |
......@@ -207,7 +207,7 @@ getGroupEntryForID gid =
doubleAllocWhileERANGE "getGroupEntryForID" "group" grBufSize unpackGroupEntry $
c_getgrgid_r gid pgr
foreign import ccall unsafe "getgrgid_r"
foreign import capi unsafe "HsUnix.h getgrgid_r"
c_getgrgid_r :: CGid -> Ptr CGroup -> CString
-> CSize -> Ptr (Ptr CGroup) -> IO CInt
#else
......@@ -226,7 +226,7 @@ getGroupEntryForName name =
doubleAllocWhileERANGE "getGroupEntryForName" "group" grBufSize unpackGroupEntry $
c_getgrnam_r pstr pgr
foreign import ccall unsafe "getgrnam_r"
foreign import capi unsafe "HsUnix.h getgrnam_r"
c_getgrnam_r :: CString -> Ptr CGroup -> CString
-> CSize -> Ptr (Ptr CGroup) -> IO CInt
#else
......
......@@ -5,6 +5,10 @@
* Add support for `base-4.8.0.0`
* Add haddock comments on `RTLD_NEXT` and `RTLD_DEFAULT`
* Deprecate function `haveRtldLocal`
* Fix `getGroupEntryForID/getGroupEntryForName' on Solaris. Solaris uses
CPP macros for required getgrgid_r and getgrnam_r functions definition
so the fix is to change from C ABI calling convention to C API calling
convention
## 2.7.0.1 *Mar 2014*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment