[commit: packages/process] master: rebased and set back WINDOWS_CCONV (f8b53d8)
git at git.haskell.org
git at git.haskell.org
Wed Jul 19 21:18:55 UTC 2017
Repository : ssh://git@git.haskell.org/process
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/f8b53d8db973ecabaeaf5ae5b1332734fccf1419/process
>---------------------------------------------------------------
commit f8b53d8db973ecabaeaf5ae5b1332734fccf1419
Author: Tamar Christina <tamar at zhox.com>
Date: Sun Jan 29 21:06:58 2017 +0000
rebased and set back WINDOWS_CCONV
>---------------------------------------------------------------
f8b53d8db973ecabaeaf5ae5b1332734fccf1419
System/Process/Windows.hsc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/System/Process/Windows.hsc b/System/Process/Windows.hsc
index 07c4f0d..ff8d3a7 100644
--- a/System/Process/Windows.hsc
+++ b/System/Process/Windows.hsc
@@ -44,10 +44,17 @@ import System.Win32.Process (getProcessId)
-- The double hash is used so that hsc does not process this include file
##include "processFlags.h"
-#include "windows_cconv.h"
#include <fcntl.h> /* for _O_BINARY */
+##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
+
throwErrnoIfBadPHandle :: String -> IO PHANDLE -> IO PHANDLE
throwErrnoIfBadPHandle = throwErrnoIfNull
More information about the ghc-commits
mailing list