[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 b50545484994340a660a7b28ffe27ee4cc905170
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Jul 21 20:30:08 2005 +0100

    Initial changes to many files for Windows compatibility

diff --git a/MissingH/Cmd.hs b/MissingH/Cmd.hs
index a99d00b..c0d2121 100644
--- a/MissingH/Cmd.hs
+++ b/MissingH/Cmd.hs
@@ -1,4 +1,5 @@
 -- arch-tag: Command utilities main file
+{-# LANGUAGE CPP #-}
 {-
 Copyright (C) 2004-2005 John Goerzen <jgoerzen at complete.org>
 
@@ -68,6 +69,8 @@ Here is an example of the wrong way to do it:
 You must instead process the data before calling 'forceSuccess'.
 
 When using the hPipe family of functions, this is probably more obvious.
+
+Most of this module will be incompatible with Windows.
 -}
 
 
@@ -94,8 +97,10 @@ where
 import System.Exit
 import System.Cmd
 import MissingH.Logging.Logger
+#ifndef mingw32_HOST_OS
 import System.Posix.IO
 import System.Posix.Process
+#endif
 import System.Posix.Types
 import System.IO
 import System.IO.Error
diff --git a/MissingH/IO/HVFS.hs b/MissingH/IO/HVFS.hs
index 22f763b..5a39611 100644
--- a/MissingH/IO/HVFS.hs
+++ b/MissingH/IO/HVFS.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- arch-tag: HVFS main file
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
@@ -66,7 +67,9 @@ import MissingH.IO.HVIO
 import MissingH.Time
 import System.IO
 import System.IO.Error
+#ifndef mingw32_HOST_OS
 import System.Posix.Files
+#endif
 import System.Posix.Types
 import System.Time
 import System.Directory
diff --git a/MissingH/IO/HVFS/Combinators.hs b/MissingH/IO/HVFS/Combinators.hs
index 8753fa9..b7401b4 100644
--- a/MissingH/IO/HVFS/Combinators.hs
+++ b/MissingH/IO/HVFS/Combinators.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- arch-tag: HVFS Combinators
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
@@ -44,7 +45,9 @@ import MissingH.IO.HVIO
 import MissingH.IO.HVFS.InstanceHelpers
 import System.IO
 import System.IO.Error
+#ifndef mingw32_HOST_OS
 import System.Posix.Files
+#endif
 import System.Posix.Types
 import System.Time
 import System.Directory
diff --git a/MissingH/IO/HVFS/Utils.hs b/MissingH/IO/HVFS/Utils.hs
index c56bd79..8cadbd2 100644
--- a/MissingH/IO/HVFS/Utils.hs
+++ b/MissingH/IO/HVFS/Utils.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- arch-tag: HVFS utilities main file
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
@@ -45,7 +46,9 @@ where
 
 import MissingH.IO.HVFS
 import MissingH.Time
+#ifndef mingw32_HOST_OS
 import System.Posix.Files
+#endif
 import MissingH.Printf
 import System.Time
 import System.Locale
diff --git a/MissingH/Path.hs b/MissingH/Path.hs
index f80af56..7152dc5 100644
--- a/MissingH/Path.hs
+++ b/MissingH/Path.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- arch-tag: Path utilities main file
 Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
 
@@ -43,9 +44,11 @@ where
 import Data.List
 import MissingH.List
 import System.Directory hiding (createDirectory)
+#ifndef mingw32_HOST_OS
 import System.Posix.Files
 import System.Posix.Directory (createDirectory)
 import System.Posix.Temp
+#endif
 import Control.Exception
 import System.IO
 import MissingH.Path.NameManip

-- 
haskell-testpack