diff options
| author | Hettomei <itsumo.sibyllin@gmail.com> | 2015-05-08 01:16:12 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-07-17 21:40:37 -0400 |
| commit | 1b7dcb2f705f5074f2b60d0b2e33d2a4982dfab2 (patch) | |
| tree | b49a41678d242060f5dda8efa288c573b71a7978 /src | |
| parent | 4d79edccdc0243a02a20ef46184b8f87f2bda290 (diff) | |
| download | rneovim-1b7dcb2f705f5074f2b60d0b2e33d2a4982dfab2.tar.gz rneovim-1b7dcb2f705f5074f2b60d0b2e33d2a4982dfab2.tar.bz2 rneovim-1b7dcb2f705f5074f2b60d0b2e33d2a4982dfab2.zip | |
Macro cleanup: FEAT_GUI and ALWAYS_USE_GUI
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 5b4c90cc8f..8263ff4896 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2234,15 +2234,11 @@ void mch_errmsg(char *str) { int len; -#if (defined(UNIX) || defined(FEAT_GUI)) && !defined(ALWAYS_USE_GUI) +#ifdef UNIX /* On Unix use stderr if it's a tty. * When not going to start the GUI also use stderr. * On Mac, when started from Finder, stderr is the console. */ - if ( -# ifdef UNIX - isatty(2) -# endif - ) { + if (os_isatty(2)) { fprintf(stderr, "%s", str); return; } @@ -2284,16 +2280,12 @@ void mch_errmsg(char *str) */ void mch_msg(char *str) { -#if (defined(UNIX) || defined(FEAT_GUI)) && !defined(ALWAYS_USE_GUI) +#ifdef UNIX /* On Unix use stdout if we have a tty. This allows "vim -h | more" and * uses mch_errmsg() when started from the desktop. * When not going to start the GUI also use stdout. * On Mac, when started from Finder, stderr is the console. */ - if ( -# ifdef UNIX - isatty(2) -# endif - ) { + if (os_isatty(2)) { printf("%s", str); return; } |