[commit: unix] encoding: Use __GLASGOW_HASKELL__ instead of MIN_VERSION_base (445eb48)

Max Bolingbroke batterseapower at hotmail.com
Wed Apr 6 16:37:31 CEST 2011


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

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/445eb48fd0dabfafe8c04e6c406624a875001576

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

commit 445eb48fd0dabfafe8c04e6c406624a875001576
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Wed Apr 6 15:34:40 2011 +0100

    Use __GLASGOW_HASKELL__ instead of MIN_VERSION_base

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

 System/Posix/Directory.hsc            |    2 +-
 System/Posix/DynamicLinker/Module.hsc |    3 ++-
 System/Posix/Env.hsc                  |    2 +-
 System/Posix/Files.hsc                |    2 +-
 System/Posix/Temp.hsc                 |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/System/Posix/Directory.hsc b/System/Posix/Directory.hsc
index 7040e6f..97728db 100644
--- a/System/Posix/Directory.hsc
+++ b/System/Posix/Directory.hsc
@@ -39,7 +39,7 @@ import System.Posix.Error
 import System.Posix.Types
 import Foreign
 import Foreign.C
-#if MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
 import System.Posix.Internals (withFilePath, peekFilePath)
 #elif __GLASGOW_HASKELL__ > 611
 import System.Posix.Internals (withFilePath)
diff --git a/System/Posix/DynamicLinker/Module.hsc b/System/Posix/DynamicLinker/Module.hsc
index 47cd5cc..7ea8284 100644
--- a/System/Posix/DynamicLinker/Module.hsc
+++ b/System/Posix/DynamicLinker/Module.hsc
@@ -58,10 +58,11 @@ where
 
 import System.Posix.DynamicLinker
 import Foreign.Ptr	( Ptr, nullPtr, FunPtr )
-import Foreign.C.String	( withCString )
 #if __GLASGOW_HASKELL__ > 611
 import System.Posix.Internals ( withFilePath )
 #else
+import Foreign.C.String	( withCString )
+
 withFilePath :: FilePath -> (CString -> IO a) -> IO a
 withFilePath = withCString
 #endif
diff --git a/System/Posix/Env.hsc b/System/Posix/Env.hsc
index 712e714..03dfc8d 100644
--- a/System/Posix/Env.hsc
+++ b/System/Posix/Env.hsc
@@ -33,7 +33,7 @@ import Foreign.Ptr
 import Foreign.Storable
 import Control.Monad	( liftM )
 import Data.Maybe	( fromMaybe )
-#if MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
 import System.Posix.Internals (withFilePath, peekFilePath)
 #elif __GLASGOW_HASKELL__ > 611
 import System.Posix.Internals (withFilePath)
diff --git a/System/Posix/Files.hsc b/System/Posix/Files.hsc
index 5113ef7..e8dbe43 100644
--- a/System/Posix/Files.hsc
+++ b/System/Posix/Files.hsc
@@ -93,7 +93,7 @@ import Data.Bits
 import System.Posix.Internals
 import Foreign hiding (unsafePerformIO)
 import Foreign.C
-#if MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
 import System.Posix.Internals (withFilePath, peekFilePath)
 #elif __GLASGOW_HASKELL__ > 611
 import System.Posix.Internals (withFilePath)
diff --git a/System/Posix/Temp.hsc b/System/Posix/Temp.hsc
index cd63954..6125802 100644
--- a/System/Posix/Temp.hsc
+++ b/System/Posix/Temp.hsc
@@ -32,7 +32,7 @@ import System.Posix.IO
 import System.Posix.Types
 import Foreign.C
 
-#if MIN_VERSION_base(4,3,2)
+#if __GLASGOW_HASKELL__ > 700
 import System.Posix.Internals (withFilePath, peekFilePath)
 #elif __GLASGOW_HASKELL__ > 611
 import System.Posix.Internals (withFilePath)





More information about the Cvs-libraries mailing list