Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bd39c0ce02ad07515450bfe5d667ce1635221b04 >--------------------------------------------------------------- commit bd39c0ce02ad07515450bfe5d667ce1635221b04 Author: Judah Jacobson <[email protected]> Date: Sat May 19 22:41:53 2012 +0000 Fix issues with previous Win64 patch. >--------------------------------------------------------------- System/Console/Haskeline/Backend/Win32.hsc | 9 ++++++++- System/Console/Haskeline/Directory.hsc | 9 ++++++++- haskeline.cabal | 4 ++-- includes/windows_cconv.h | 11 ----------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc index 25927fc..97e5782 100644 --- a/System/Console/Haskeline/Backend/Win32.hsc +++ b/System/Console/Haskeline/Backend/Win32.hsc @@ -25,8 +25,15 @@ import System.Console.Haskeline.Backend.WCWidth import Data.ByteString.Internal (createAndTrim) import qualified Data.ByteString as B +##if defined(i386_HOST_ARCH) +## define WINDOWS_CCONV stdcall +##elif defined(x86_64_HOST_ARCH) +## define WINDOWS_CCONV ccall +##else +## error Unknown mingw32 arch +##endif + #include "win_console.h" -#include "windows_cconv.h" foreign import WINDOWS_CCONV "windows.h ReadConsoleInputW" c_ReadConsoleInput :: HANDLE -> Ptr () -> DWORD -> Ptr DWORD -> IO Bool diff --git a/System/Console/Haskeline/Directory.hsc b/System/Console/Haskeline/Directory.hsc index 9024e9b..292849c 100644 --- a/System/Console/Haskeline/Directory.hsc +++ b/System/Console/Haskeline/Directory.hsc @@ -20,7 +20,14 @@ import qualified System.Directory #include <windows.h> #include <Shlobj.h> -#include "windows_cconv.h" + +##if defined(i386_HOST_ARCH) +## define WINDOWS_CCONV stdcall +##elif defined(x86_64_HOST_ARCH) +## define WINDOWS_CCONV ccall +##else +## error Unknown mingw32 arch +##endif foreign import WINDOWS_CCONV "FindFirstFileW" c_FindFirstFile :: LPCTSTR -> Ptr () -> IO HANDLE diff --git a/haskeline.cabal b/haskeline.cabal index c8b4590..3628ffe 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -98,8 +98,8 @@ Library Build-depends: Win32>=2.0 Other-modules: System.Console.Haskeline.Backend.Win32 c-sources: cbits/win_console.c - includes: win_console.h windows_cconv.h - install-includes: win_console.h windows_cconv.h + includes: win_console.h + install-includes: win_console.h cpp-options: -DMINGW } else { Build-depends: unix>=2.0 && < 2.6 diff --git a/includes/windows_cconv.h b/includes/windows_cconv.h deleted file mode 100644 index 2ee26f6..0000000 --- a/includes/windows_cconv.h +++ /dev/null @@ -1,11 +0,0 @@ -// Define the foreign import calling convention. -// On Win32, it's stdcall. -// On Win64, it's ccall. -#if defined(i386_HOST_ARCH) -#define WINDOWS_CCONV stdcall -#elif defined(x86_64_HOST_ARCH) -#define WINDOWS_CCONV ccall -#else -#error Unknown mingw32 arch -#endif - _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
