Commit d78ab147 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Now that we require GHC >= 6.4.2, System.IO.Error is always available

parent 53ddf8f4
......@@ -22,12 +22,6 @@ you will screw up the layout where they are used in case expressions!
* settings for the target plat instead). */
#include "../includes/ghcautoconf.h"
#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 602
#define SYSTEM_IO_ERROR System.IO.Error
#else
#define SYSTEM_IO_ERROR System.IO
#endif
/* Global variables may not work in other Haskell implementations,
* but we need them currently! so the conditional on GLASGOW won't do. */
#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
......
......@@ -38,7 +38,7 @@ import System.Exit ( ExitCode(..), exitWith )
import System.Directory
import System.FilePath
import System.IO
import SYSTEM_IO_ERROR ( isEOFError )
import System.IO.Error ( isEOFError )
import Control.Monad ( when )
import Data.Maybe ( isJust )
......
......@@ -53,7 +53,7 @@ import GHC.Exts ( Int(..) )
import System.Directory
import System.FilePath
import System.IO
import SYSTEM_IO_ERROR as IO
import System.IO.Error as IO
import Control.Monad
import Data.List ( isSuffixOf )
import Data.Maybe
......
......@@ -52,7 +52,7 @@ import System.Exit
import System.Environment
import System.FilePath
import System.IO
import SYSTEM_IO_ERROR as IO
import System.IO.Error as IO
import System.Directory
import Data.Char
import Data.Maybe
......
......@@ -94,7 +94,7 @@ import FastTypes
#endif
import Control.Monad ( unless )
import SYSTEM_IO_ERROR as IO ( catch, isDoesNotExistError )
import System.IO.Error as IO ( catch, isDoesNotExistError )
import System.Directory ( doesDirectoryExist, createDirectory,
getModificationTime )
import System.FilePath hiding ( searchPathSeparator )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment