diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2022-09-18 03:17:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 09:17:15 +0800 |
| commit | 6d557e324fd4223fff3279a0112f40431c540163 (patch) | |
| tree | 74b9d80ccfe5bb6ac628a3455aa1f2c6c3b20497 /src/nvim/lua/executor.c | |
| parent | 3c3f3e7353ba2cb9071183cd05036ca2a98d3672 (diff) | |
| download | rneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.gz rneovim-6d557e324fd4223fff3279a0112f40431c540163.tar.bz2 rneovim-6d557e324fd4223fff3279a0112f40431c540163.zip | |
vim-patch:8.1.0941: macros for MS-Windows are inconsistent (#20215)
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes vim/vim#3932)
https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Diffstat (limited to 'src/nvim/lua/executor.c')
| -rw-r--r-- | src/nvim/lua/executor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index d56b3642aa..09f8c688d8 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -248,7 +248,7 @@ static int nlua_luv_thread_common_cfpcall(lua_State *lstate, int nargs, int nres mch_errmsg(e_outofmem); mch_errmsg("\n"); lua_close(lstate); -#ifdef WIN32 +#ifdef MSWIN ExitThread(0); #else pthread_exit(0); @@ -673,7 +673,7 @@ static bool nlua_state_init(lua_State *const lstate) FUNC_ATTR_NONNULL_ALL lua_setfield(lstate, -2, "debug"); lua_pop(lstate, 1); -#ifdef WIN32 +#ifdef MSWIN // os.getenv lua_getglobal(lstate, "os"); lua_pushcfunction(lstate, &nlua_getenv); @@ -1201,7 +1201,7 @@ static int nlua_empty_dict_tostring(lua_State *lstate) return 1; } -#ifdef WIN32 +#ifdef MSWIN /// os.getenv: override os.getenv to maintain coherency. #9681 /// /// uv_os_setenv uses SetEnvironmentVariableW which does not update _environ. |