Mercurial > hg > xemacs-beta
diff src/systty.h @ 4765:1257b938f03a
automatic merge
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Fri, 04 Dec 2009 10:59:45 +0900 |
parents | aa5ed11f473b |
children | 308d34e9f07d |
line wrap: on
line diff
--- a/src/systty.h Fri Dec 04 10:56:38 2009 +0900 +++ b/src/systty.h Fri Dec 04 10:59:45 2009 +0900 @@ -60,9 +60,6 @@ /***** (2) The TERMIO way (system V style) *****/ -# ifdef __DGUX -# include <sys/ioctl.h> -# endif # ifndef NO_TERMIO # include <termio.h> # endif /* not NO_TERMIO */ @@ -100,27 +97,15 @@ /* Generally useful to include this file: */ -/* But Sun OS has broken include files and doesn't want it included */ -#if !defined (WIN32_NATIVE) && !defined (SUNOS4) +#if !defined (WIN32_NATIVE) # include <sys/ioctl.h> #endif -/* UNIPLUS systems may have FIONREAD. */ -#ifdef UNIPLUS -#include <sys.ioctl.h> -#endif /* ----------------------------------------------------- */ /* miscellaneous includes */ /* ----------------------------------------------------- */ -#ifdef AIXHFT /* obsolete - only found in AIX version 3. */ -/* Get files for keyboard remapping */ -#define HFNKEYS 2 -#include <sys/hft.h> -#include <sys/devinfo.h> -#endif - /* Include files for PTY's */ #if defined (HAVE_SYS_PTYIO_H) /* HP-UX */ @@ -142,18 +127,13 @@ /* ----------------------------------------------------- */ -#if defined (XENIX) || defined (BROKEN_TIOCGETC) +#if defined (BROKEN_TIOCGETC) #undef TIOCGETC /* Avoid confusing some conditionals that test this. */ #endif /* XEmacs: SIGIO is cleaned up so we remove the crap here that messes with it (and FIONREAD and FASYNC, which are related). */ -#ifdef BROKEN_TIOCGWINSZ /* XEmacs addition */ -#undef TIOCGWINSZ -#undef TIOCSWINSZ -#endif - /* On TERMIOS systems, the tcmumbleattr calls take care of these parameters, and it's a bad idea to use them (on AIX, it makes the tty hang for a long time). */