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

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 14f1423..1622928 100644 (file)
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -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__)

diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index 772a157..795a469 100644 (file)
--- a/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
@@ -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 )
 

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a59cf46..b848e83 100644 (file)
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -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

diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs
index 12fc36e..c433374 100644 (file)
--- a/compiler/main/SysTools.lhs
+++ b/compiler/main/SysTools.lhs
@@ -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

diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs
index 82e0393..62e2eda 100644 (file)
--- a/compiler/utils/Util.lhs
+++ b/compiler/utils/Util.lhs
@@ -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 )