Move unsafeWithForeignPtr shim into Utils

Bodigrim · Aug 7, 2022 · 6df394e · 6df394e
1 parent 6462e4f
commit 6df394e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Data/ByteString/Internal.hs b/Data/ByteString/Internal.hs
@@ -164,18 +164,9 @@ import GHC.Ptr                  (Ptr(..))
 
 import GHC.Types                (Int (..))
 
-#if MIN_VERSION_base(4,15,0)
-import GHC.ForeignPtr           (unsafeWithForeignPtr)
-#endif
-
 import qualified Language.Haskell.TH.Lib as TH
 import qualified Language.Haskell.TH.Syntax as TH
 
-#if !MIN_VERSION_base(4,15,0)
-unsafeWithForeignPtr :: ForeignPtr a -> (Ptr a -> IO b) -> IO b
-unsafeWithForeignPtr = withForeignPtr
-#endif
-
 -- CFILES stuff is Hugs only
 {-# CFILES cbits/fpstring.c #-}
 

diff --git a/Data/ByteString/Internal/Utils.hs b/Data/ByteString/Internal/Utils.hs
@@ -9,6 +9,7 @@ module Data.ByteString.Internal.Utils (
   plusForeignPtr,
   minusForeignPtr,
   memcpyf,
+  unsafeWithForeignPtr,
 
   createf,
   createfUptoN,
@@ -33,7 +34,9 @@ import Foreign.Storable (Storable(..))
 import GHC.Exts (Int(I#), minusAddr#)
 import GHC.ForeignPtr
   ( ForeignPtr(ForeignPtr)
+#if MIN_VERSION_base(4,15,0)
   , unsafeWithForeignPtr
+#endif
   , mallocPlainForeignPtrBytes
   )
 import GHC.IO (unsafeDupablePerformIO)
@@ -84,6 +87,10 @@ pokefpByteOff :: Storable a => ForeignPtr b -> Int -> a -> IO ()
 pokefpByteOff fp off val = unsafeWithForeignPtr fp $ \p ->
   pokeByteOff p off val
 
+#if !MIN_VERSION_base(4,15,0)
+unsafeWithForeignPtr :: ForeignPtr a -> (Ptr a -> IO b) -> IO b
+unsafeWithForeignPtr = withForeignPtr
+#endif
 
 
 -- Utilities for ByteString creation