mirror of
https://github.com/neovim/neovim.git
synced 2025-09-27 13:38:34 +00:00
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)
4f97475d32
This commit is contained in:
@@ -1451,7 +1451,7 @@ static inline char *add_dir(char *dest, const char *const dir, const size_t dir_
|
||||
if (!after_pathsep(dest - 1, dest)) {
|
||||
*dest++ = PATHSEP;
|
||||
}
|
||||
#if defined(WIN32)
|
||||
#if defined(MSWIN)
|
||||
size_t size = (type == kXDGDataHome ? sizeof("nvim-data") - 1 : NVIM_SIZE);
|
||||
memmove(dest, (type == kXDGDataHome ? "nvim-data" : "nvim"), size);
|
||||
dest += size;
|
||||
@@ -1521,7 +1521,7 @@ char *runtimepath_default(bool clean_arg)
|
||||
if (data_home != NULL) {
|
||||
data_len = strlen(data_home);
|
||||
if (data_len != 0) {
|
||||
#if defined(WIN32)
|
||||
#if defined(MSWIN)
|
||||
size_t nvim_size = (sizeof("nvim-data") - 1);
|
||||
#else
|
||||
size_t nvim_size = NVIM_SIZE;
|
||||
@@ -1664,7 +1664,7 @@ int source_level(void *cookie)
|
||||
/// If possible the handle is closed on exec().
|
||||
static FILE *fopen_noinh_readbin(char *filename)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef MSWIN
|
||||
int fd_tmp = os_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0);
|
||||
#else
|
||||
int fd_tmp = os_open(filename, O_RDONLY, 0);
|
||||
|
Reference in New Issue
Block a user