diff options
| author | Matt Kline <matt@bitbashing.io> | 2018-06-18 09:24:34 -0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-18 19:24:34 +0200 |
| commit | 09cd4d0a4340b8ba731f9ba9b3a51a002e9da75f (patch) | |
| tree | e54aa846ad6f2ac48a8d25003f789f7b0b733e8d /src/nvim/os | |
| parent | 66a39fce6c70222a7f4a2dbd223a6d0c3a4a5789 (diff) | |
| download | rneovim-09cd4d0a4340b8ba731f9ba9b3a51a002e9da75f.tar.gz rneovim-09cd4d0a4340b8ba731f9ba9b3a51a002e9da75f.tar.bz2 rneovim-09cd4d0a4340b8ba731f9ba9b3a51a002e9da75f.zip | |
use wchar_t instead of WCHAR #6998
wchar_t has better cross-platform support and seems to fix an issue
on MinGW when building with `-std=c99`.
Diffstat (limited to 'src/nvim/os')
| -rw-r--r-- | src/nvim/os/env.c | 4 | ||||
| -rw-r--r-- | src/nvim/os/fs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 25c4cc4f92..0df857352b 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -56,7 +56,7 @@ int os_setenv(const char *name, const char *value, int overwrite) char *envbuf = xmalloc(envbuflen); snprintf(envbuf, envbuflen, "%s=%s", name, value); - WCHAR *p; + wchar_t *p; utf8_to_utf16(envbuf, &p); xfree(envbuf); if (p == NULL) { @@ -146,7 +146,7 @@ void os_get_hostname(char *hostname, size_t size) xstrlcpy(hostname, vutsname.nodename, size); } #elif defined(WIN32) - WCHAR host_utf16[MAX_COMPUTERNAME_LENGTH + 1]; + wchar_t host_utf16[MAX_COMPUTERNAME_LENGTH + 1]; DWORD host_wsize = sizeof(host_utf16) / sizeof(host_utf16[0]); if (GetComputerNameW(host_utf16, &host_wsize) == 0) { *hostname = '\0'; diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 5412c5daae..cf00fd4f82 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -1052,7 +1052,7 @@ char *os_resolve_shortcut(const char *fname) hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (void **)&pslw); if (hr == S_OK) { - WCHAR *p; + wchar_t *p; const int conversion_result = utf8_to_utf16(fname, &p); if (conversion_result != 0) { EMSG2("utf8_to_utf16 failed: %d", conversion_result); @@ -1080,7 +1080,7 @@ char *os_resolve_shortcut(const char *fname) # endif // Get the path to the link target. - ZeroMemory(wsz, MAX_PATH * sizeof(WCHAR)); + ZeroMemory(wsz, MAX_PATH * sizeof(wchar_t)); hr = pslw->lpVtbl->GetPath(pslw, wsz, MAX_PATH, &ffdw, 0); if (hr == S_OK && wsz[0] != NUL) { const int conversion_result = utf16_to_utf8(wsz, &rfname); |