From: Daniel W. <dm...@lu...> - 2013-05-08 21:32:13
|
diffing dir... Sun May 5 09:49:07 BST 2013 Hamish Mackenzie <ham...@go...> * Fixes for GHC 7.8 Ignore-this: 63ac1e3048e08681fbded980548ac575 hunk ./cairo/Graphics/Rendering/Cairo/Internal/Utilities.chs 20 +import System.IO.Unsafe (unsafePerformIO) hunk ./cairo/Gtk2HsSetup.hs 254 + ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__] hunk ./gio/Gtk2HsSetup.hs 246 + ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__] hunk ./glib/Gtk2HsSetup.hs 246 + ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__] hunk ./gtk/Gtk2HsSetup.hs 246 + ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__] hunk ./pango/Gtk2HsSetup.hs 246 + ++ ["-D__GLASGOW_HASKELL__="++show __GLASGOW_HASKELL__] hunk ./tools/c2hs/base/general/Binary.hs 63 -# if __GLASGOW_HASKELL__>=602 +#if __GLASGOW_HASKELL__>=602 +# if __GLASGOW_HASKELL__>=707 +import Data.HashTable.Class as HashTable + (HashTable) +import Data.HashTable.IO as HashTable + (BasicHashTable, toList, new, insert, lookup) +# else hunk ./tools/c2hs/base/general/Binary.hs 72 +#endif hunk ./tools/c2hs/base/general/Binary.hs 707 +# if __GLASGOW_HASKELL__>=707 + ud_map :: BasicHashTable String Int -- The index of each string +# else hunk ./tools/c2hs/base/general/Binary.hs 711 +# endif hunk ./tools/c2hs/base/general/Binary.hs 728 +# if __GLASGOW_HASKELL__>=707 + out_r <- HashTable.new +# else hunk ./tools/c2hs/base/general/Binary.hs 732 +# endif hunk ./tools/gtk2hs-buildtools.cabal 118 + if impl(ghc >= 7.7) + build-depends: hashtables hunk ./tools/hierarchyGen/Hierarchy.chs.template 39 -import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr) +import Foreign.ForeignPtr (ForeignPtr, castForeignPtr) +#if __GLASGOW_HASKELL__ >= 707 +import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr) +#else +import Foreign.ForeignPtr (unsafeForeignPtrToPtr) +#endif |