diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-08 20:26:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 20:26:18 +0100 |
| commit | 9cefd83cc7b96d9a20ae8aae5ad5f2c4a02a74f4 (patch) | |
| tree | 2933dd4aa96bd42eb8939c7a2afe2fcf544834f1 /src/nvim/main.c | |
| parent | d82621877b72ee8322a5b88adaba4edd5ad3b308 (diff) | |
| parent | 0adf950ccf9a0057c552a349d79a716ff7be6f8f (diff) | |
| download | rneovim-9cefd83cc7b96d9a20ae8aae5ad5f2c4a02a74f4.tar.gz rneovim-9cefd83cc7b96d9a20ae8aae5ad5f2c4a02a74f4.tar.bz2 rneovim-9cefd83cc7b96d9a20ae8aae5ad5f2c4a02a74f4.zip | |
Merge #8084 'build/win: support MSVC'
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 4fd55f1491..4288d7f9d7 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -7,11 +7,6 @@ #include <string.h> #include <stdbool.h> -#ifdef WIN32 -# include <wchar.h> -# include <winnls.h> -#endif - #include <msgpack.h> #include "nvim/ascii.h" @@ -795,7 +790,7 @@ static void command_line_scan(mparm_T *parmp) mch_exit(0); } else if (STRICMP(argv[0] + argv_idx, "api-info") == 0) { 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); if (fof_ret != 0) { @@ -1256,10 +1251,10 @@ static void check_and_set_isatty(mparm_T *paramp) paramp->err_isatty = os_isatty(fileno(stderr)); #ifndef WIN32 int tty_fd = paramp->input_isatty - ? OS_STDIN_FILENO + ? STDIN_FILENO : (paramp->output_isatty - ? OS_STDOUT_FILENO - : (paramp->err_isatty ? OS_STDERR_FILENO : -1)); + ? STDOUT_FILENO + : (paramp->err_isatty ? STDERR_FILENO : -1)); pty_process_save_termios(tty_fd); #endif TIME_MSG("window checked"); |