From 8fdf1b265d982b80bfa8e6d98374514ece20a03e Mon Sep 17 00:00:00 2001 From: Claes Nästén Date: Mon, 6 Dec 2021 07:44:44 +0100 Subject: fix: define NAME_MAX from _XOPEN_NAME_MAX On SunOS NAME_MAX is not defined, _XOPEN_NAME_MAX is so fall back to defining NAME_MAX from _XOPEN_NAME_MAX. --- src/nvim/os/os_defs.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/nvim/os') diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h index 8049b3b80e..dce4b0c187 100644 --- a/src/nvim/os/os_defs.h +++ b/src/nvim/os/os_defs.h @@ -13,6 +13,10 @@ # include "nvim/os/unix_defs.h" #endif +#if !defined(NAME_MAX) && defined(_XOPEN_NAME_MAX) +#define NAME_MAX _XOPEN_NAME_MAX +#endif + #define BASENAMELEN (NAME_MAX - 5) // Use the system path length if it makes sense. -- cgit From 435dd04bdb7b385fe63bdd6985cda3380663e959 Mon Sep 17 00:00:00 2001 From: Claes Nästén Date: Mon, 6 Dec 2021 07:51:42 +0100 Subject: fix: don't include pty.h on SunOS --- src/nvim/os/pty_process_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c index 24ecf5c24f..abbb410293 100644 --- a/src/nvim/os/pty_process_unix.c +++ b/src/nvim/os/pty_process_unix.c @@ -15,7 +15,7 @@ # include #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) # include -#else +#elif !defined(__sun) # include #endif -- cgit From 05f9f63f2478841f9fa6261c68663797fa9d43f6 Mon Sep 17 00:00:00 2001 From: Claes Nästén Date: Mon, 6 Dec 2021 07:53:14 +0100 Subject: fix: don't use cfsetspeed, use i and o variants cfsetspeed is not available on SunOS, use cfsetispeed and cfsetospeed instead. --- src/nvim/os/pty_process_unix.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c index abbb410293..450bc75ffb 100644 --- a/src/nvim/os/pty_process_unix.c +++ b/src/nvim/os/pty_process_unix.c @@ -198,7 +198,9 @@ static void init_termios(struct termios *termios) FUNC_ATTR_NONNULL_ALL termios->c_cflag = CS8|CREAD; termios->c_lflag = ISIG|ICANON|IEXTEN|ECHO|ECHOE|ECHOK; - cfsetspeed(termios, 38400); + // not using cfsetspeed, not available on all platforms + cfsetispeed(termios, 38400); + cfsetospeed(termios, 38400); #ifdef IUTF8 termios->c_iflag |= IUTF8; -- cgit