[commit: bytestring] ghc-7.6: Remove the old memcpy_ptr_baoff / memcpy alias (fa0cbcc)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/bytestring

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/fa0cbcc0b3c1d22917fa0fb62dfa2e847b0c1eb1

>---------------------------------------------------------------

commit fa0cbcc0b3c1d22917fa0fb62dfa2e847b0c1eb1
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Sun Sep 2 23:41:36 2012 +0000

    Remove the old memcpy_ptr_baoff / memcpy alias

>---------------------------------------------------------------

 Data/ByteString.hs          |    1 +
 Data/ByteString/Internal.hs |   11 -----------
 include/fpstring.h          |   12 ------------
 3 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/Data/ByteString.hs b/Data/ByteString.hs
index 426cede..21630f3 100644
--- a/Data/ByteString.hs
+++ b/Data/ByteString.hs
@@ -1786,6 +1786,7 @@ mkPS buf start end =
         memcpy_ptr_baoff p buf (fromIntegral start) (fromIntegral len)
         return ()
 
+memcpy_ptr_baoff dst src src_off sz = memcpy dst (src+src_off) sz
 #endif
 
 mkBigPS :: Int -> [ByteString] -> IO ByteString
diff --git a/Data/ByteString/Internal.hs b/Data/ByteString/Internal.hs
index 17d9b6f..e3727ca 100644
--- a/Data/ByteString/Internal.hs
+++ b/Data/ByteString/Internal.hs
@@ -63,10 +63,6 @@ module Data.ByteString.Internal (
         c_maximum,              -- :: Ptr Word8 -> CInt -> IO Word8
         c_minimum,              -- :: Ptr Word8 -> CInt -> IO Word8
         c_count,                -- :: Ptr Word8 -> CInt -> Word8 -> IO CInt
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 611
-        -- * Internal GHC magic
-        memcpy_ptr_baoff,       -- :: Ptr a -> RawBuffer -> CInt -> CSize -> IO (Ptr ())
-#endif
 
         -- * Chars
         w2c, c2w, isSpaceWord8, isSpaceChar8
@@ -584,10 +580,3 @@ foreign import ccall unsafe "static fpstring.h fps_minimum" c_minimum
 foreign import ccall unsafe "static fpstring.h fps_count" c_count
     :: Ptr Word8 -> CULong -> Word8 -> IO CULong
 
--- ---------------------------------------------------------------------
--- Internal GHC Haskell magic
-
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 611
-foreign import ccall unsafe "__hscore_memcpy_src_off"
-   memcpy_ptr_baoff :: Ptr a -> RawBuffer -> CInt -> CSize -> IO (Ptr ())
-#endif
diff --git a/include/fpstring.h b/include/fpstring.h
index 5fc1b62..dc6653c 100644
--- a/include/fpstring.h
+++ b/include/fpstring.h
@@ -7,15 +7,3 @@ unsigned char fps_maximum(unsigned char *p, unsigned long  len);
 unsigned char fps_minimum(unsigned char *p, unsigned long  len);
 unsigned long fps_count(unsigned char *p, unsigned long  len, unsigned char w);
 
-#ifndef INLINE
-# if defined(_MSC_VER)
-#  define INLINE extern __inline
-# else
-#  define INLINE static inline
-# endif
-#endif
-INLINE void *
-__hscore_memcpy_src_off( char *dst, char *src, int src_off, size_t sz )
-{ return memcpy(dst, src+src_off, sz); }
-
-