Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/25260e414272113f6708b7de65ad010093f87fbc >--------------------------------------------------------------- commit 25260e414272113f6708b7de65ad010093f87fbc Author: Paolo Capriotti <[email protected]> Date: Sat Aug 25 20:23:16 2012 +0100 Fix 7170 for i386. >--------------------------------------------------------------- tests/ffi/should_run/7170.hs | 4 ++-- tests/ffi/should_run/7170.stdout | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ffi/should_run/7170.hs b/tests/ffi/should_run/7170.hs index dc4c457..4dbf65a 100644 --- a/tests/ffi/should_run/7170.hs +++ b/tests/ffi/should_run/7170.hs @@ -1,7 +1,7 @@ {-# LANGUAGE ForeignFunctionInterface #-} import Control.Concurrent import Control.Exception (bracket) -import Foreign.Ptr (Ptr, intPtrToPtr) +import Foreign.Ptr (Ptr, intPtrToPtr, ptrToIntPtr) import Foreign.ForeignPtr (ForeignPtr) import qualified Foreign.Concurrent as FC import qualified Foreign.ForeignPtr as FP @@ -10,7 +10,7 @@ testForeignPtr_Concurrent :: Ptr a -> IO (ForeignPtr a) testForeignPtr_Concurrent ptr = FC.newForeignPtr ptr (fin ptr) fin :: Ptr a -> IO () -fin ptr = putStrLn $ "finalizing " ++ show ptr +fin ptr = putStrLn $ "finalizing " ++ show (fromIntegral (ptrToIntPtr ptr) :: Int) main :: IO () main = do diff --git a/tests/ffi/should_run/7170.stdout b/tests/ffi/should_run/7170.stdout index 3329201..8962a40 100644 --- a/tests/ffi/should_run/7170.stdout +++ b/tests/ffi/should_run/7170.stdout @@ -1 +1 @@ -finalizing 0x0000000000000001 +finalizing 1 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
