From b7b024c10bdf1e3c7c9becf83ebf6e90bee8511f Mon Sep 17 00:00:00 2001
From: panne <unknown>
Date: Tue, 28 Jan 2003 21:48:23 +0000
Subject: [PATCH] [project @ 2003-01-28 21:48:23 by panne] As agreed (= no
 riots after the proposal :-) on the FFI list, introduce a
 re-exporting module Foreign.Marshal

---
 Foreign.hs         |   24 +++++++++---------------
 Foreign/Marshal.hs |   26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 Foreign/Marshal.hs

diff --git a/Foreign.hs b/Foreign.hs
index 15e26db..e0f9e4c 100644
--- a/Foreign.hs
+++ b/Foreign.hs
@@ -16,19 +16,16 @@
 
 module Foreign
         ( module Data.Int
-	, module Data.Word
-	, module Foreign.Ptr
-	, module Foreign.ForeignPtr
-	, module Foreign.StablePtr
+        , module Data.Word
+        , module Foreign.Ptr
+        , module Foreign.ForeignPtr
+        , module Foreign.StablePtr
         , 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
 
 import Data.Int
@@ -37,9 +34,6 @@ 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)
diff --git a/Foreign/Marshal.hs b/Foreign/Marshal.hs
new file mode 100644
index 0000000..61c0008
--- /dev/null
+++ b/Foreign/Marshal.hs
@@ -0,0 +1,26 @@
+{-# OPTIONS -fno-implicit-prelude #-}
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Foreign.Marshal
+-- Copyright   :  (c) The FFI task force 2003
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
+-- 
+-- Maintainer  :  ffi@haskell.org
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- Marshalling support
+--
+-----------------------------------------------------------------------------
+
+module Foreign.Marshal
+        ( module Foreign.Marshal.Alloc
+        , module Foreign.Marshal.Array
+        , module Foreign.Marshal.Error
+        , module Foreign.Marshal.Utils
+        ) where
+
+import Foreign.Marshal.Alloc
+import Foreign.Marshal.Array
+import Foreign.Marshal.Error
+import Foreign.Marshal.Utils
-- 
1.7.10.4