[commit: packages/haskeline] ghc-head: Fix build on Win64 Manual merge from git.haskell.org/packages/haskeline.git Original patch by Ian Lynagh (0ef9364)

git at git.haskell.org git at git.haskell.org
Sat Oct 12 20:06:47 UTC 2013


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

On branch  : ghc-head
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/0ef9364fbc27c6a61c9cdc6b57b11aea1fc57570

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

commit 0ef9364fbc27c6a61c9cdc6b57b11aea1fc57570
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Sat Oct 12 18:06:11 2013 +0000

    Fix build on Win64
    Manual merge from git.haskell.org/packages/haskeline.git
    Original patch by Ian Lynagh


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

0ef9364fbc27c6a61c9cdc6b57b11aea1fc57570
 System/Console/Haskeline/Backend/Win32.hsc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc
index 35c5c77..d54df2c 100644
--- a/System/Console/Haskeline/Backend/Win32.hsc
+++ b/System/Console/Haskeline/Backend/Win32.hsc
@@ -431,7 +431,7 @@ type Handler = DWORD -> IO BOOL
 
 foreign import ccall "wrapper" wrapHandler :: Handler -> IO (FunPtr Handler)
 
-foreign import stdcall "windows.h SetConsoleCtrlHandler" c_SetConsoleCtrlHandler
+foreign import WINDOWS_CCONV "windows.h SetConsoleCtrlHandler" c_SetConsoleCtrlHandler
     :: FunPtr Handler -> BOOL -> IO BOOL
 
 -- sets the tv to True when ctrl-c is pressed.



More information about the ghc-commits mailing list