Date: Wed, 16 Jul 2008 12:39:23 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 145326 for review Message-ID: <200807161239.m6GCdNY3043885@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145326 Change 145326 by ed@ed_dull on 2008/07/16 12:38:48 Revert some of the changes to <sys/termios.h> to keep it more in sync with the vendor source. Affected files ... .. //depot/projects/mpsafetty/sys/sys/termios.h#2 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/termios.h#2 (text+ko) ==== @@ -109,9 +109,6 @@ #ifndef _POSIX_SOURCE #define ONLCR 0x00000002 /* map NL to CR-NL (ala CRMOD) */ #define OXTABS 0x00000004 /* expand tabs to spaces */ -#ifndef _KERNEL -#define TAB3 OXTABS -#endif /* !_KERNEL */ #define ONOEOT 0x00000008 /* discard EOT's (^D) on output) */ #define OCRNL 0x00000010 /* map CR to NL on output */ #define ONOCR 0x00000020 /* no CR output at column 0 */ @@ -254,9 +251,6 @@ #define TCION 4 #include <sys/cdefs.h> -#ifndef _POSIX_SOURCE -#include <sys/ttycom.h> -#endif __BEGIN_DECLS speed_t cfgetispeed(const struct termios *); @@ -282,6 +276,16 @@ #endif /* !_KERNEL */ +#ifndef _POSIX_SOURCE + +/* + * Include tty ioctl's that aren't just for backwards compatibility + * with the old tty driver. These ioctl definitions were previously + * in <sys/ioctl.h>. + */ +#include <sys/ttycom.h> +#endif + /* * END OF PROTECTED INCLUDE. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807161239.m6GCdNY3043885>