Merge pull request #1491 from Pyrohh/os2-and-misc-cleanup

Remove MiNT, NeXTSTEP, OS/2 References
This commit is contained in:
Justin M. Keyes
2014-11-28 15:38:43 -05:00
24 changed files with 71 additions and 104 deletions

View File

@@ -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.
@@ -10,7 +9,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.
@@ -524,9 +523,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
*/
@@ -554,9 +552,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 */
@@ -622,9 +619,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;

View File

@@ -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 <stdio.h>
#include <ctype.h>
# include <sys/types.h>
# include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
# include <stdlib.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>

View File

@@ -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