From 7620e6adb81607c939802c81bf8c068faf0211f8 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 17 Jun 2017 06:19:46 +0300 Subject: use windows_cconv.h from Win32 --- src/WindowsEnv/Environment.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WindowsEnv/Environment.hs') diff --git a/src/WindowsEnv/Environment.hs b/src/WindowsEnv/Environment.hs index 6784d43..5ad6315 100644 --- a/src/WindowsEnv/Environment.hs +++ b/src/WindowsEnv/Environment.hs @@ -100,11 +100,11 @@ pathSplit = filter (not . null) . splitOn pathSep pathJoin :: [String] -> String pathJoin = intercalate pathSep . filter (not . null) -#include "ccall.h" +#include "windows_cconv.h" -- ExpandEnvironmentStrings isn't provided by Win32 (as of version 2.4.0.0). -foreign import WINDOWS_ENV_CCALL unsafe "Windows.h ExpandEnvironmentStringsW" +foreign import WINDOWS_CCONV unsafe "Windows.h ExpandEnvironmentStringsW" c_ExpandEnvironmentStrings :: WinAPI.LPCTSTR -> WinAPI.LPTSTR -> WinAPI.DWORD -> IO WinAPI.ErrCode expand :: String -> ExceptT IOError IO String -- cgit v1.2.3