[Glibc-bsd-commits] r6102 - trunk/glibc-ports-2.24/kfreebsd/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-09-05 21:31:30 +0000 (Mon, 05 Sep 2016)
New Revision: 6102

Modified:
   trunk/glibc-ports-2.24/kfreebsd/bits/termios.h
Log:
termios: revert revisions 6084 and 6087

It happens I was overzealous trying to improve the termios interface by
adding new constants. Programs (for example GCC) consider that having one
of the constants implies that the others are also defined.

Revert revisions 6084 and 6087 for now to go back to the previous situation




Modified: trunk/glibc-ports-2.24/kfreebsd/bits/termios.h
===================================================================
--- trunk/glibc-ports-2.24/kfreebsd/bits/termios.h	2016-08-15 08:24:28 UTC (rev 6101)
+++ trunk/glibc-ports-2.24/kfreebsd/bits/termios.h	2016-09-05 21:31:30 UTC (rev 6102)
@@ -115,31 +115,13 @@
 #define	OPOST	(1 << 0)	/* Perform output processing.  */
 #define	ONLCR	(1 << 1)	/* Map NL to CR-NL on output.  */
 #if defined __USE_MISC || defined __USE_XOPEN
-# define NLDLY	0x00000300	/* \n delay */
-# define NL0	0x00000000
-# define NL1	0x00000100	/* tty 37 */
-# define NL2	0x00000200	/* vt05 */
-# define NL3	0x00000300
-# define TABDLY	0x00000c00	/* horizontal tab delay */
-# define TAB0	0x00000000
-# define TAB1	0x00000400	/* tty 37 */
-# define TAB2	0x00000800
-# define CRDLY	0x00003000	/* \r delay */
-# define CR0	0x00000000
-# define CR1	0x00001000	/* tn 300 */
-# define CR2	0x00002000	/* tty 37 */
-# define CR3	0x00003000	/* concept 100 */
-# define FFDLY	0x00004000	/* vertical tab delay */
-# define FF0	0x00000000
-# define FF1	0x00004000	/* tty 37 */
-# define BSDLY	0x00008000	/* \b delay */
-# define BS0	0x00000000
-# define BS1	0x00008000
+# define TAB0   (0 << 2)	/* no tab delay and expansion */
+# define TAB3   (1 << 2)	/* expand tabs to spaces */
+# define TABDLY	TAB3		/* tab delay mask */
+# define OXTABS	TAB3
+# define XTABS	TAB3
 #endif
 #ifdef	__USE_MISC
-# define XTABS	0x00000c00	/* expand tabs on output */
-#endif
-#ifdef	__USE_MISC
 # define ONOEOT	(1 << 3)	/* Discard EOT (^D) on output.  */
 #endif
 #define	OCRNL	(1 << 4)	/* map CR to NL on output */