diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/base/Foreign/C/String.hs | 11 | ||||
| -rw-r--r-- | libraries/base/GHC/Foreign.hs | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/libraries/base/Foreign/C/String.hs b/libraries/base/Foreign/C/String.hs index a8eb60c5a3..2b0c7ec250 100644 --- a/libraries/base/Foreign/C/String.hs +++ b/libraries/base/Foreign/C/String.hs @@ -110,20 +110,11 @@ import GHC.Base import {-# SOURCE #-} GHC.IO.Encoding import qualified GHC.Foreign as GHC +import GHC.Foreign (CString, CStringLen) ----------------------------------------------------------------------------- -- Strings --- representation of strings in C --- ------------------------------ - --- | A C string is a reference to an array of C characters terminated by NUL. -type CString = Ptr CChar - --- | A string with explicit length information in bytes instead of a --- terminating NUL (allowing NUL characters in the middle of the string). -type CStringLen = (Ptr CChar, Int) - -- exported functions -- ------------------ -- diff --git a/libraries/base/GHC/Foreign.hs b/libraries/base/GHC/Foreign.hs index 4792c1b33e..78ffa11bee 100644 --- a/libraries/base/GHC/Foreign.hs +++ b/libraries/base/GHC/Foreign.hs @@ -19,6 +19,7 @@ module GHC.Foreign ( -- * C strings with a configurable encoding + CString, CStringLen, -- conversion of C strings into Haskell strings -- @@ -74,8 +75,11 @@ putDebugMsg | c_DEBUG_DUMP = debugLn | otherwise = const (return ()) --- These definitions are identical to those in Foreign.C.String, but copied in here to avoid a cycle: +-- | A C string is a reference to an array of C characters terminated by NUL. type CString = Ptr CChar + +-- | A string with explicit length information in bytes instead of a +-- terminating NUL (allowing NUL characters in the middle of the string). type CStringLen = (Ptr CChar, Int) -- exported functions |