From: ross Date: Fri, 21 Jan 2005 00:14:41 +0000 (+0000) Subject: [project @ 2005-01-21 00:14:41 by ross] X-Git-Tag: Initial_conversion_from_CVS_complete~1211 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e9012cf188a4a558657b7691dd7cb06c1000a684;p=ghc-hetmet.git [project @ 2005-01-21 00:14:41 by ross] repair import breakage --- diff --git a/ghc/lib/compat/Compat/Directory.hs b/ghc/lib/compat/Compat/Directory.hs index 0dfdb88..7f6306c 100644 --- a/ghc/lib/compat/Compat/Directory.hs +++ b/ghc/lib/compat/Compat/Directory.hs @@ -25,17 +25,19 @@ module Compat.Directory ( #include "config.h" #endif -import Control.Exception ( bracket ) -import Control.Monad ( when ) import System.Environment (getEnv) import System.FilePath +#if __GLASGOW_HASKELL__ > 600 +import Control.Exception ( bracket ) +import Control.Monad ( when ) +import Foreign.Marshal.Alloc ( allocaBytes ) import System.IO (IOMode(..), openBinaryFile, hGetBuf, hPutBuf, hClose) import System.IO.Error ( try ) -import Foreign.Marshal.Alloc ( allocaBytes ) -import System.Directory(doesFileExist, doesDirectoryExist, getPermissions, setPermissions, createDirectory) -#if defined(__GLASGOW_HASKELL__) import GHC.IOBase ( IOException(..) ) +#else +import System.IO ( try ) #endif +import System.Directory(doesFileExist, doesDirectoryExist, getPermissions, setPermissions, createDirectory) getAppUserDataDirectory :: String -> IO FilePath getAppUserDataDirectory appName = do