[Gtk2hs-commit] gtk2hs/glib/System/Glib FFI.hs,1.1,1.2 GType.chs,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/glib/System/Glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32046/glib/System/Glib

Modified Files:
	FFI.hs GType.chs 
Log Message:
In older ghc versions Foreign does not export unsafePerformIO, so import it
from System.IO.Unsafe instead.
Also conditionally export unsafePerformIO since older ghc versions do not
export it from module Foreign.


Index: GType.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/GType.chs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GType.chs	8 Jan 2005 17:46:16 -0000	1.1
+++ GType.chs	16 Jan 2005 21:29:41 -0000	1.2
@@ -29,10 +29,7 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import Foreign.C
-
-import Foreign (unsafePerformIO)
+import System.Glib.FFI
 
 {# context lib="glib" prefix="g" #}
 

Index: FFI.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/System/Glib/FFI.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FFI.hs	8 Jan 2005 17:45:06 -0000	1.1
+++ FFI.hs	16 Jan 2005 21:29:41 -0000	1.2
@@ -31,11 +31,16 @@
   foreignFree,
   newForeignPtr,
   foreignPtrToPtr,
+# if __GLASGOW_HASKELL__<600
+  -- ghc 6 exports unsafePerformIO from module Foreign
+  -- provide it here for ghc 5
+  unsafePerformIO,
+# endif
   module Foreign,
   module Foreign.C
   ) where
 
-import Foreign (unsafePerformIO)
+import System.IO.Unsafe (unsafePerformIO)
 
 import Foreign.C
 import qualified Foreign