[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 5a186c0ab47cd18ba1d9d095fda757e5b7501599
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Jul 21 21:31:37 2005 +0100

    HVFS stuff now builds, thanks to WindowsCompat

diff --git a/MissingH/IO/HVFS.hs b/MissingH/IO/HVFS.hs
index fd2dd40..4b3f77d 100644
--- a/MissingH/IO/HVFS.hs
+++ b/MissingH/IO/HVFS.hs
@@ -69,6 +69,8 @@ import System.IO
 import System.IO.Error
 #ifndef mingw32_HOST_OS
 import System.Posix.Files
+#else
+import MissingH.IO.WindowsCompat
 #endif
 import System.Posix.Types
 import System.Time
@@ -122,13 +124,6 @@ reasonable values.
 A default implementation of this is not currently present on Windows.
 -}
 
-#ifdef mingw32_HOST_OS
--- these types aren't defined here
-type LinkCount = Int
-type UserID = Int
-type GroupID = Int
-#endif
-
 class (Show a) => HVFSStat a where
     vDeviceID :: a -> DeviceID
     vFileID :: a -> FileID
diff --git a/MissingH/IO/HVFS/Utils.hs b/MissingH/IO/HVFS/Utils.hs
index c17fa52..afa07db 100644
--- a/MissingH/IO/HVFS/Utils.hs
+++ b/MissingH/IO/HVFS/Utils.hs
@@ -48,6 +48,8 @@ import MissingH.IO.HVFS
 import MissingH.Time
 #ifndef mingw32_HOST_OS
 import System.Posix.Files
+#else
+import MissingH.IO.WindowsCompat
 #endif
 import MissingH.Printf
 import System.Time
diff --git a/MissingH/IO/WindowsCompat.hs b/MissingH/IO/WindowsCompat.hs
index cd32218..d0798f5 100644
--- a/MissingH/IO/WindowsCompat.hs
+++ b/MissingH/IO/WindowsCompat.hs
@@ -34,7 +34,7 @@ Copyright (c) 2005 John Goerzen, jgoerzen\@complete.org
 
 -}
 
-module MissingH.IO.WindowsCompat()
+module MissingH.IO.WindowsCompat
 where
 
 import System.Posix.Types
@@ -45,7 +45,6 @@ import Data.Bits
 type LinkCount = Int
 type UserID = Int
 type GroupID = Int
-#endif
 
 nullFileMode :: FileMode
 nullFileMode = 0
@@ -100,3 +99,8 @@ otherModes = 00007
 accessModes :: FileMode
 accessModes = ownerModes .|. groupModes .|. otherModes
 
+intersectFileModes :: FileMode -> FileMode -> FileMode
+intersectFileModes m1 m2 = m1 .&. m2
+
+#endif
+

-- 
haskell-testpack