Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a53c12a1a366d0b0c15fe3a3ed0c4925b83d7d34 >--------------------------------------------------------------- commit a53c12a1a366d0b0c15fe3a3ed0c4925b83d7d34 Author: Ian Lynagh <[email protected]> Date: Tue May 1 20:06:44 2012 +0100 Fix Win64 build now that hsc2hs knows what platform we're on >--------------------------------------------------------------- compiler/ghci/LibFFI.hsc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/ghci/LibFFI.hsc b/compiler/ghci/LibFFI.hsc index d543079..9bdabda 100644 --- a/compiler/ghci/LibFFI.hsc +++ b/compiler/ghci/LibFFI.hsc @@ -57,7 +57,7 @@ prepForeignCall cconv arg_types result_type convToABI :: CCallConv -> C_ffi_abi convToABI CCallConv = fFI_DEFAULT_ABI -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH) convToABI StdCallConv = fFI_STDCALL #endif -- unknown conventions are mapped to the default, (#3336) @@ -111,7 +111,7 @@ fFI_OK = (#const FFI_OK) fFI_DEFAULT_ABI :: C_ffi_abi fFI_DEFAULT_ABI = (#const FFI_DEFAULT_ABI) -#ifdef mingw32_HOST_OS +#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH) fFI_STDCALL :: C_ffi_abi fFI_STDCALL = (#const FFI_STDCALL) #endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
