projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump version to 4.3.0.0, added instance MonadPlus STM
[ghc-base.git]
/
Foreign.hs
diff --git
a/Foreign.hs
b/Foreign.hs
index
15e26db
..
622ec93
100644
(file)
--- a/
Foreign.hs
+++ b/
Foreign.hs
@@
-1,4
+1,4
@@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
-----------------------------------------------------------------------------
-- |
-- Module : Foreign
-----------------------------------------------------------------------------
-- |
-- Module : Foreign
@@
-15,31
+15,27
@@
-----------------------------------------------------------------------------
module Foreign
-----------------------------------------------------------------------------
module Foreign
- ( module Data.Int
- , module Data.Word
- , module Foreign.Ptr
- , module Foreign.ForeignPtr
- , module Foreign.StablePtr
+ ( module Data.Bits
+ , module Data.Int
+ , module Data.Word
+ , module Foreign.Ptr
+ , module Foreign.ForeignPtr
+ , module Foreign.StablePtr
, module Foreign.Storable
, module Foreign.Storable
- , module Foreign.Marshal.Alloc
- , module Foreign.Marshal.Array
- , module Foreign.Marshal.Error
- , module Foreign.Marshal.Utils
+ , module Foreign.Marshal
- -- For compatibility with the FFI addendum only. The recommended
- -- place to get this from is System.IO.Unsafe.
- , unsafePerformIO
+ -- | For compatibility with the FFI addendum only. The recommended
+ -- place to get this from is "System.IO.Unsafe".
+ , unsafePerformIO
) where
) where
+import Data.Bits
import Data.Int
import Data.Word
import Foreign.Ptr
import Foreign.ForeignPtr
import Foreign.StablePtr
import Foreign.Storable
import Data.Int
import Data.Word
import Foreign.Ptr
import Foreign.ForeignPtr
import Foreign.StablePtr
import Foreign.Storable
-import Foreign.Marshal.Alloc
-import Foreign.Marshal.Array
-import Foreign.Marshal.Error
-import Foreign.Marshal.Utils
+import Foreign.Marshal
import System.IO.Unsafe (unsafePerformIO)
import System.IO.Unsafe (unsafePerformIO)