From c8d57e25e94dba23837d7ed10d681faeba5d98d2 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 18 Nov 2014 00:09:46 -0500 Subject: Remove NeXTSTEP references Remove trailing whitespace as well. --- src/nvim/os_unix.c | 6 ++---- src/nvim/os_unix_defs.h | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 3bf1198b46..fb65f8603f 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -569,9 +569,8 @@ void mch_settmode(int tmode) { static int first = TRUE; - /* Why is NeXT excluded here (and not in os_unixx.h)? */ #if defined(ECHOE) && defined(ICANON) && (defined(HAVE_TERMIO_H) || \ - defined(HAVE_TERMIOS_H)) && !defined(__NeXT__) + defined(HAVE_TERMIOS_H)) /* * for "new" tty systems */ @@ -667,9 +666,8 @@ void get_stty(void) char_u buf[2]; char_u *p; - /* Why is NeXT excluded here (and not in os_unixx.h)? */ #if defined(ECHOE) && defined(ICANON) && (defined(HAVE_TERMIO_H) || \ - defined(HAVE_TERMIOS_H)) && !defined(__NeXT__) + defined(HAVE_TERMIOS_H)) /* for "new" tty systems */ # ifdef HAVE_TERMIOS_H struct termios keys; diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h index 2a44ec3412..ebea86ebcf 100644 --- a/src/nvim/os_unix_defs.h +++ b/src/nvim/os_unix_defs.h @@ -8,17 +8,13 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -/* - * NextStep has a problem with configure, undefine a few things: - */ - #include #include -# include -# include +#include +#include -# include +#include #ifdef HAVE_UNISTD_H # include -- cgit From 83a4c9d58ce9265fc5b18e1f4e289552a56e9a56 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 18 Nov 2014 01:06:53 -0500 Subject: Remove Atari MiNT references --- src/nvim/os_unix.c | 5 ++--- src/nvim/term.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index fb65f8603f..311ff414a9 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -10,7 +10,7 @@ /* * os_unix.c -- code for all flavors of Unix (BSD, SYSV, SVR4, POSIX, ...) - * Also for BeOS and Atari MiNT. + * Also for BeOS * * A lot of this file was originally written by Juergen Weigert and later * changed beyond recognition. @@ -598,9 +598,8 @@ void mch_settmode(int tmode) */ tnew.c_iflag &= ~ICRNL; tnew.c_lflag &= ~(ICANON | ECHO | ISIG | ECHOE -# if defined(IEXTEN) && !defined(__MINT__) +# if defined(IEXTEN) | IEXTEN /* IEXTEN enables typing ^V on SOLARIS */ - /* but it breaks function keys on MINT */ # endif ); # ifdef ONLCR /* don't map NL -> CR NL, we do it ourselves */ diff --git a/src/nvim/term.c b/src/nvim/term.c index 3d1053bd2f..601e98f562 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -639,7 +639,7 @@ static struct builtin_term builtin_termcaps[] = {K_BS, "\x7f"}, /* for some reason 0177 doesn't work */ # endif -# if defined(ALL_BUILTIN_TCAPS) || defined(__MINT__) +# if defined(ALL_BUILTIN_TCAPS) /* * Ordinary vt52 */ @@ -998,7 +998,7 @@ static struct builtin_term builtin_termcaps[] = -#if defined(UNIX) && !defined(__MINT__) +#if defined(UNIX) # define DEFAULT_TERM (char_u *)"ansi" #endif -- cgit From ba1e2ce287752a1bd30d52f77493a5bb582c2349 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Tue, 18 Nov 2014 01:44:47 -0500 Subject: Remove OS/2 references Paul Slootman was removed from the top of os_unix.c as OS/2 is no longer supported, but is still credited in runtime/doc/intro.txt. --- src/nvim/os_unix.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 311ff414a9..a415b541a8 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -1,6 +1,5 @@ /* * VIM - Vi IMproved by Bram Moolenaar - * OS/2 port by Paul Slootman * VMS merge by Zoltan Arpadffy * * Do ":help uganda" in Vim to read copying and usage conditions. -- cgit