[commit: packages/Win32] ghc-head: Allow building with base 4.5 once again (a420a0c)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/packages/Win32.git/commitdiff/a420a0cab1d824c47c0b7dc91ce9fc61be7faa00

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

commit a420a0cab1d824c47c0b7dc91ce9fc61be7faa00
Author: Bryan O'Sullivan <bos at serpentine.com>
Date:   Tue Feb 4 12:26:56 2014 -0800

    Allow building with base 4.5 once again


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

a420a0cab1d824c47c0b7dc91ce9fc61be7faa00
 Graphics/Win32/Key.hsc |    5 ++---
 System/Win32/Info.hsc  |   17 +++++++++++------
 Win32.cabal            |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Graphics/Win32/Key.hsc b/Graphics/Win32/Key.hsc
index ff21d51..e1c414b 100755
--- a/Graphics/Win32/Key.hsc
+++ b/Graphics/Win32/Key.hsc
@@ -17,10 +17,9 @@
 
 module Graphics.Win32.Key where
 
-import Graphics.Win32.GDI.Types
-import System.Win32.Types
-
 import Control.Monad (liftM)
+import Graphics.Win32.GDI.Types (HWND)
+import System.Win32.Types (DWORD, UINT, WORD, ptrToMaybe)
 
 ##include "windows_cconv.h"
 
diff --git a/System/Win32/Info.hsc b/System/Win32/Info.hsc
old mode 100644
new mode 100755
index b6275da..23e2eac
--- a/System/Win32/Info.hsc
+++ b/System/Win32/Info.hsc
@@ -17,13 +17,18 @@
 
 module System.Win32.Info where
 
-import System.Win32.Types
-
 import Control.Exception (catch)
-import System.IO.Error
-import Foreign      ( Storable(sizeOf, alignment, peekByteOff, pokeByteOff,
-                               peek, poke)
-                    , Ptr, alloca, allocaArray )
+import Foreign.Marshal.Alloc (alloca)
+import Foreign.Marshal.Array (allocaArray)
+import Foreign.Ptr (Ptr, nullPtr)
+import Foreign.Storable (Storable(..))
+import System.IO.Error (isDoesNotExistError)
+import System.Win32.Types (DWORD, LPCTSTR, LPTSTR, LPVOID, UINT, WORD)
+import System.Win32.Types (failIfZero, peekTStringLen, withTString)
+
+#if !MIN_VERSION_base(4,6,0)
+import Prelude hiding (catch)
+#endif
 
 ##include "windows_cconv.h"
 
diff --git a/Win32.cabal b/Win32.cabal
index 4edf5b8..e5eb693 100755
--- a/Win32.cabal
+++ b/Win32.cabal
@@ -17,7 +17,7 @@ extra-source-files:
 	include/Win32Aux.h include/win32debug.h include/windows_cconv.h
 
 Library
-    build-depends:	base >= 4.6 && < 5, bytestring
+    build-depends:	base >= 4.5 && < 5, bytestring
     ghc-options:    -Wall -fno-warn-name-shadowing
     cc-options:     -fno-strict-aliasing
     exposed-modules: