[commit: ghc] master: avoid name clash (52d9f09)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/52d9f09bba0d6ff5a629c5cadf38166bbdce9378

>---------------------------------------------------------------

commit 52d9f09bba0d6ff5a629c5cadf38166bbdce9378
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jun 4 11:06:26 2012 +0100

    avoid name clash

>---------------------------------------------------------------

 compiler/ghci/Linker.lhs |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 6787d39..e6f49e1 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -64,7 +64,11 @@ import Control.Concurrent.MVar
 
 import System.FilePath
 import System.IO
+#if __GLASGOW_HASKELL__ > 704
+import System.Directory hiding (findFile)
+#else
 import System.Directory
+#endif
 
 import Distribution.Package hiding (depends, PackageId)