[commit: directory] encoding: Use __GLASGOW_HASKELL__ instead of MIN_VERSION_base (72e8af6)

Ian Lynagh igloo at earth.li
Fri Apr 8 13:40:59 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/packages/directory

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/72e8af6ee4821f66a52b1caa22edaebbf25799fb

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

commit 72e8af6ee4821f66a52b1caa22edaebbf25799fb
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Wed Apr 6 15:32:27 2011 +0100

    Use __GLASGOW_HASKELL__ instead of MIN_VERSION_base

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

 System/Directory.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 27d6879..22a07f8 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -112,7 +112,7 @@ import GHC.IO.Exception	( IOException(..), IOErrorType(..), ioException )
 import GHC.IOBase	( IOException(..), IOErrorType(..), ioException )
 #endif
 
-#if MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
 import GHC.IO.Encoding
 import GHC.Foreign as GHC
 #endif
@@ -715,7 +715,7 @@ canonicalizePath fpath =
 #if defined(mingw32_HOST_OS)
     do path <- Win32.getFullPathName fpath
 #else
-#if __GLASGOW_HASKELL__ && MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
   GHC.withCString fileSystemEncoding fpath $ \pInPath ->
   allocaBytes long_path_size $ \pOutPath ->
     do throwErrnoPathIfNull "canonicalizePath" fpath $ c_realpath pInPath pOutPath





More information about the Cvs-libraries mailing list