[commit: packages/Win32] master: Avoid redundant-import warning with base>=4.8.0 (22160ac)

git at git.haskell.org git at git.haskell.org
Thu Jul 30 06:57:30 UTC 2015


Repository : ssh://git@git.haskell.org/Win32

On branch  : master
Link       : http://git.haskell.org/packages/Win32.git/commitdiff/22160ac62a530a2be362e885d7c2aad26ef432bf

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

commit 22160ac62a530a2be362e885d7c2aad26ef432bf
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Sep 22 22:38:15 2014 +0200

    Avoid redundant-import warning with base>=4.8.0
    
    Starting wih base-4.8.0.0, `Word` is exported from `Prelude`


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

22160ac62a530a2be362e885d7c2aad26ef432bf
 System/Win32/Types.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/System/Win32/Types.hs b/System/Win32/Types.hs
old mode 100644
new mode 100755
index 68a4ff1..c09a22f
--- a/System/Win32/Types.hs
+++ b/System/Win32/Types.hs
@@ -25,7 +25,7 @@ import Data.Bits (shiftL, shiftR, (.|.), (.&.))
 import Data.Char (isSpace)
 import Data.Int (Int32, Int64)
 import Data.Maybe (fromMaybe)
-import Data.Word (Word, Word8, Word16, Word32, Word64)
+import Data.Word (Word8, Word16, Word32, Word64)
 import Foreign.C.Error (getErrno, errnoToIOError)
 import Foreign.C.String (newCWString, withCWStringLen)
 import Foreign.C.String (peekCWString, peekCWStringLen, withCWString)
@@ -36,6 +36,10 @@ import Numeric (showHex)
 import System.IO.Error (ioeSetErrorString)
 import System.IO.Unsafe (unsafePerformIO)
 
+#if !MIN_VERSION_base(4,8,0)
+import Data.Word (Word)
+#endif
+
 #if MIN_VERSION_base(4,7,0)
 import Data.Bits (finiteBitSize)
 #else



More information about the ghc-commits mailing list