diff options
Diffstat (limited to 'app/luit/sys.c')
| -rw-r--r-- | app/luit/sys.c | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/app/luit/sys.c b/app/luit/sys.c index efec546af..ba60fbf04 100644 --- a/app/luit/sys.c +++ b/app/luit/sys.c @@ -34,14 +34,8 @@ THE SOFTWARE. #include <signal.h> #include <errno.h> -#ifdef SVR4 -#define HAVE_POLL -#endif - -#ifndef HAVE_POLL -#ifndef _MINIX -#define HAVE_SELECT -#endif +#ifdef HAVE_CONFIG_H +# include "config.h" #endif #ifdef HAVE_POLL @@ -49,27 +43,20 @@ THE SOFTWARE. #undef HAVE_SELECT #endif -#ifdef __QNX__ -#include <sys/select.h> -#endif - - -#if (defined(__GLIBC__) && \ - (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) || \ - defined(SVR4) -#define HAVE_GRANTPT +#ifdef HAVE_SYS_SELECT_H +# include <sys/select.h> #endif -#ifdef __GLIBC__ -#include <pty.h> +#ifdef HAVE_PTY_H +# include <pty.h> #endif -#ifdef SVR4 -#include <stropts.h> +#ifdef HAVE_STROPTS_H +# include <stropts.h> #endif -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include <sys/param.h> +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> #endif #include "sys.h" @@ -340,7 +327,12 @@ allocatePty(int *pty_return, char **line_return) char *temp_line; int rc; +#ifdef __APPLE__ + pty = posix_openpt(O_RDWR); +#else pty = open("/dev/ptmx", O_RDWR); +#endif + if(pty < 0) goto bsd; @@ -428,7 +420,7 @@ openTty(char *line) } #endif -#ifdef SVR4 +#if defined(SVR4) || defined(__SVR4) rc = ioctl(tty, I_PUSH, "ptem"); if(rc < 0) goto bail; |