diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2017-06-17 06:19:46 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2017-06-17 06:19:46 +0300 |
| commit | 7620e6adb81607c939802c81bf8c068faf0211f8 (patch) | |
| tree | a7bc89495f1984939e22de3626584b3b25666dd9 /src/WindowsEnv/Environment.hs | |
| parent | add --version flag to executables (diff) | |
| download | windows-env-7620e6adb81607c939802c81bf8c068faf0211f8.tar.gz windows-env-7620e6adb81607c939802c81bf8c068faf0211f8.zip | |
use windows_cconv.h from Win32
Diffstat (limited to 'src/WindowsEnv/Environment.hs')
| -rw-r--r-- | src/WindowsEnv/Environment.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |