mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 08:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/msvc: Fix standard IO file number definitions

Browse Source 
With MSVC, STDOUT_FILENO and STDERR_FILENO are defined as function calls instead of constants, meaning they can't be assigned to enum values. The enum was only used in one file, so it has been removed. A definition for STDIN_FILENO has been added that is consistent with the other two definitions.
This commit is contained in:
b-r-o-c-k
2018-02-28 19:14:27 -06:00
parent 2c414fbbb1
commit 60a341a05f
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/main.c
View File

@@ -795,7 +795,7 @@ static void command_line_scan(mparm_T *parmp)
mch_exit(0); mch_exit(0);
} else if (STRICMP(argv[0] + argv_idx, "api-info") == 0) { } else if (STRICMP(argv[0] + argv_idx, "api-info") == 0) {
FileDescriptor fp; FileDescriptor fp;
const int fof_ret = file_open_fd(&fp, OS_STDOUT_FILENO, true); const int fof_ret = file_open_fd(&fp, STDOUT_FILENO, true);
msgpack_packer *p = msgpack_packer_new(&fp, msgpack_file_write); msgpack_packer *p = msgpack_packer_new(&fp, msgpack_file_write);
if (fof_ret != 0) { if (fof_ret != 0) {
@@ -1256,10 +1256,10 @@ static void check_and_set_isatty(mparm_T *paramp)
paramp->err_isatty = os_isatty(fileno(stderr)); paramp->err_isatty = os_isatty(fileno(stderr));
#ifndef WIN32 #ifndef WIN32
int tty_fd = paramp->input_isatty int tty_fd = paramp->input_isatty
? OS_STDIN_FILENO ? STDIN_FILENO
: (paramp->output_isatty : (paramp->output_isatty
? OS_STDOUT_FILENO ? STDOUT_FILENO
: (paramp->err_isatty ? OS_STDERR_FILENO : -1)); : (paramp->err_isatty ? STDERR_FILENO : -1));
pty_process_save_termios(tty_fd); pty_process_save_termios(tty_fd);
#endif #endif
TIME_MSG("window checked"); TIME_MSG("window checked");

7
src/nvim/os/os_defs.h
View File

@@ -13,13 +13,6 @@
# include "nvim/os/unix_defs.h" # include "nvim/os/unix_defs.h"
#endif #endif
/// File descriptor number used for standard IO streams
enum {
OS_STDIN_FILENO = STDIN_FILENO,
OS_STDOUT_FILENO = STDOUT_FILENO,
OS_STDERR_FILENO = STDERR_FILENO,
};
#define BASENAMELEN (NAME_MAX - 5) #define BASENAMELEN (NAME_MAX - 5)
// Use the system path length if it makes sense. // Use the system path length if it makes sense.

3
src/nvim/os/win_defs.h
View File

@@ -45,6 +45,9 @@
# ifndef restrict # ifndef restrict
# define restrict __restrict # define restrict __restrict
# endif # endif
# ifndef STDIN_FILENO
# define STDIN_FILENO _fileno(stdin)
# endif
# ifndef STDOUT_FILENO # ifndef STDOUT_FILENO
# define STDOUT_FILENO _fileno(stdout) # define STDOUT_FILENO _fileno(stdout)
# endif # endif