[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 73c03c776f93874f88f882c116d0481f35126fd6
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Jul 22 22:31:24 2005 +0100

    Clear up a bit of mess with intersectFileModes

diff --git a/MissingH/IO/HVFS/Utils.hs b/MissingH/IO/HVFS/Utils.hs
index afa07db..4ffbee1 100644
--- a/MissingH/IO/HVFS/Utils.hs
+++ b/MissingH/IO/HVFS/Utils.hs
@@ -46,11 +46,7 @@ where
 
 import MissingH.IO.HVFS
 import MissingH.Time
-#ifndef mingw32_HOST_OS
-import System.Posix.Files
-#else
-import MissingH.IO.WindowsCompat
-#endif
+import MissingH.IO.PlafCompat
 import MissingH.Printf
 import System.Time
 import System.Locale
diff --git a/MissingH/IO/PosixConsts.hs b/MissingH/IO/PosixConsts.hs
index 62836e1..4ec2f72 100644
--- a/MissingH/IO/PosixConsts.hs
+++ b/MissingH/IO/PosixConsts.hs
@@ -60,6 +60,4 @@ socketMode = 0o0140000
 symbolicLinkMode :: FileMode
 symbolicLinkMode = 0o0120000
 
-intersectFileModes :: FileMode -> FileMode -> FileMode
-intersectFileModes m1 m2 = m1 .&. m2
 
diff --git a/MissingH/IO/StatCompat.hs b/MissingH/IO/StatCompat.hs
index 5e7a110..2ff7f0c 100644
--- a/MissingH/IO/StatCompat.hs
+++ b/MissingH/IO/StatCompat.hs
@@ -38,6 +38,9 @@ where
 import System.Posix.Types
 import MissingH.IO.PosixConsts
 import Data.Bits
+#ifndef mingw32_HOST_OS
+import System.Posix.Files(intersectFileModes)
+#endif
 
 #ifdef mingw32_HOST_OS
 type LinkCount = Int
@@ -72,4 +75,7 @@ isDirectory = sc_helper directoryMode
 isSymbolicLink = sc_helper symbolicLinkMode
 isSocket = sc_helper socketMode
 
-    
+#ifdef mingw32_HOST_OS
+intersectFileModes :: FileMode -> FileMode -> FileMode
+intersectFileModes m1 m2 = m1 .&. m2
+#endif

-- 
haskell-testpack