diff options
| author | Szabolcs Nagy <nsz@port70.net> | 2016-07-03 17:08:54 +0200 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-07-03 15:02:24 -0400 |
| commit | ee9b5900fb098edd3e8d3df375cac8b2cfe8551f (patch) | |
| tree | 26895ccd1a2c75db306acedea831f78b2b7ce78a | |
| parent | 3bda42ac4bddc600bdae0f57c5b65c4482fbfefc (diff) | |
| download | musl-ee9b5900fb098edd3e8d3df375cac8b2cfe8551f.tar.gz musl-ee9b5900fb098edd3e8d3df375cac8b2cfe8551f.tar.xz musl-ee9b5900fb098edd3e8d3df375cac8b2cfe8551f.zip | |
fix mips termios.h macro exposure/namespace issues
same changes to the defined macros as in powerpc and generic bits.
| -rw-r--r-- | arch/mips/bits/termios.h | 29 | ||||
| -rw-r--r-- | arch/mips64/bits/termios.h | 29 | ||||
| -rw-r--r-- | arch/mipsn32/bits/termios.h | 29 |
3 files changed, 42 insertions, 45 deletions
diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h index 487c1d45..55ba1323 100644 --- a/arch/mips/bits/termios.h +++ b/arch/mips/bits/termios.h @@ -93,10 +93,7 @@ struct termios #define B9600 0000015 #define B19200 0000016 #define B38400 0000017 -#define EXTA 0000016 -#define EXTB 0000017 -#define BOTHER 0010000 #define B57600 0010001 #define B115200 0010002 #define B230400 0010003 @@ -113,8 +110,6 @@ struct termios #define B3500000 0010016 #define B4000000 0010017 -#define CBAUD 0010017 - #define CSIZE 0000060 #define CS5 0000000 #define CS6 0000020 @@ -129,18 +124,12 @@ struct termios #define ISIG 0000001 #define ICANON 0000002 -#define XCASE 0000004 #define ECHO 0000010 #define ECHOE 0000020 #define ECHOK 0000040 #define ECHONL 0000100 #define NOFLSH 0000200 #define IEXTEN 0000400 -#define ECHOCTL 0001000 -#define ECHOPRT 0002000 -#define ECHOKE 0004000 -#define FLUSHO 0020000 -#define PENDIN 0040000 #define TOSTOP 0100000 #define ITOSTOP 0100000 @@ -158,12 +147,22 @@ struct termios #define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#define EXTA 0000016 +#define EXTB 0000017 +#define CBAUD 0010017 #define CBAUDEX 0010000 -#define CIBAUD 002003600000 -#define IBSHIFT 16 -#define CMSPAR 010000000000 -#define CRTSCTS 020000000000 +#define CIBAUD 002003600000 +#define CMSPAR 010000000000 +#define CRTSCTS 020000000000 + +#define XCASE 0000004 +#define ECHOCTL 0001000 +#define ECHOPRT 0002000 +#define ECHOKE 0004000 +#define FLUSHO 0020000 +#define PENDIN 0040000 #define EXTPROC 0200000 + #define XTABS 0014000 #define TIOCSER_TEMT 1 #endif diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h index b19d4867..6a1205d7 100644 --- a/arch/mips64/bits/termios.h +++ b/arch/mips64/bits/termios.h @@ -92,10 +92,7 @@ struct termios { #define B9600 0000015 #define B19200 0000016 #define B38400 0000017 -#define EXTA 0000016 -#define EXTB 0000017 -#define BOTHER 0010000 #define B57600 0010001 #define B115200 0010002 #define B230400 0010003 @@ -112,8 +109,6 @@ struct termios { #define B3500000 0010016 #define B4000000 0010017 -#define CBAUD 0010017 - #define CSIZE 0000060 #define CS5 0000000 #define CS6 0000020 @@ -128,18 +123,12 @@ struct termios { #define ISIG 0000001 #define ICANON 0000002 -#define XCASE 0000004 #define ECHO 0000010 #define ECHOE 0000020 #define ECHOK 0000040 #define ECHONL 0000100 #define NOFLSH 0000200 #define IEXTEN 0000400 -#define ECHOCTL 0001000 -#define ECHOPRT 0002000 -#define ECHOKE 0004000 -#define FLUSHO 0020000 -#define PENDIN 0040000 #define TOSTOP 0100000 #define ITOSTOP 0100000 @@ -157,12 +146,22 @@ struct termios { #define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#define EXTA 0000016 +#define EXTB 0000017 +#define CBAUD 0010017 #define CBAUDEX 0010000 -#define CIBAUD 002003600000 -#define IBSHIFT 16 -#define CMSPAR 010000000000 -#define CRTSCTS 020000000000 +#define CIBAUD 002003600000 +#define CMSPAR 010000000000 +#define CRTSCTS 020000000000 + +#define XCASE 0000004 +#define ECHOCTL 0001000 +#define ECHOPRT 0002000 +#define ECHOKE 0004000 +#define FLUSHO 0020000 +#define PENDIN 0040000 #define EXTPROC 0200000 + #define XTABS 0014000 #define TIOCSER_TEMT 1 #endif diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h index b19d4867..6a1205d7 100644 --- a/arch/mipsn32/bits/termios.h +++ b/arch/mipsn32/bits/termios.h @@ -92,10 +92,7 @@ struct termios { #define B9600 0000015 #define B19200 0000016 #define B38400 0000017 -#define EXTA 0000016 -#define EXTB 0000017 -#define BOTHER 0010000 #define B57600 0010001 #define B115200 0010002 #define B230400 0010003 @@ -112,8 +109,6 @@ struct termios { #define B3500000 0010016 #define B4000000 0010017 -#define CBAUD 0010017 - #define CSIZE 0000060 #define CS5 0000000 #define CS6 0000020 @@ -128,18 +123,12 @@ struct termios { #define ISIG 0000001 #define ICANON 0000002 -#define XCASE 0000004 #define ECHO 0000010 #define ECHOE 0000020 #define ECHOK 0000040 #define ECHONL 0000100 #define NOFLSH 0000200 #define IEXTEN 0000400 -#define ECHOCTL 0001000 -#define ECHOPRT 0002000 -#define ECHOKE 0004000 -#define FLUSHO 0020000 -#define PENDIN 0040000 #define TOSTOP 0100000 #define ITOSTOP 0100000 @@ -157,12 +146,22 @@ struct termios { #define TCSAFLUSH 2 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#define EXTA 0000016 +#define EXTB 0000017 +#define CBAUD 0010017 #define CBAUDEX 0010000 -#define CIBAUD 002003600000 -#define IBSHIFT 16 -#define CMSPAR 010000000000 -#define CRTSCTS 020000000000 +#define CIBAUD 002003600000 +#define CMSPAR 010000000000 +#define CRTSCTS 020000000000 + +#define XCASE 0000004 +#define ECHOCTL 0001000 +#define ECHOPRT 0002000 +#define ECHOKE 0004000 +#define FLUSHO 0020000 +#define PENDIN 0040000 #define EXTPROC 0200000 + #define XTABS 0014000 #define TIOCSER_TEMT 1 #endif |