RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-14 02:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix namespace violations in termios.h, at least mostly

Browse Source 
the fix should be complete on archs that use the generic definitions
(i386, arm, x86_64, microblaze), but mips and powerpc have not been
checked thoroughly and may need more fixes.
This commit is contained in:
Rich Felker 2014-01-08 19:20:55 -05:00
parent acde013522
commit a627eb3586
6 changed files with 49 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/bits/termios.h
View File

@ -75,9 +75,6 @@ struct termios
#define VT0 0000000
#define VT1 0040000
/* ?? */
#define XTABS 0014000
#define B0 0000000
#define B50 0000001
#define B75 0000002
@ -125,8 +122,6 @@ struct termios
#define HUPCL 0002000
#define CLOCAL 0004000
#define CRTSCTS 020000000000
#define ISIG 0000001
#define ICANON 0000002
#define ECHO 0000010
@ -137,14 +132,11 @@ struct termios
#define TOSTOP 0000400
#define IEXTEN 0100000
/* Extensions? */
#define CBAUDEX 0010000
#define ECHOCTL 0001000
#define ECHOPRT 0002000
#define ECHOKE 0004000
#define FLUSHO 0010000
#define PENDIN 0040000
#define EXTPROC 0200000
#define TCOOFF 0
#define TCOON 1
@ -158,3 +150,10 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0010000
#define CRTSCTS 020000000000
#define EXTPROC 0200000
#define XTABS 0014000
#endif

15
arch/i386/bits/termios.h
View File

@ -75,9 +75,6 @@ struct termios
#define VT0 0000000
#define VT1 0040000
/* ?? */
#define XTABS 0014000
#define B0 0000000
#define B50 0000001
#define B75 0000002
@ -125,8 +122,6 @@ struct termios
#define HUPCL 0002000
#define CLOCAL 0004000
#define CRTSCTS 020000000000
#define ISIG 0000001
#define ICANON 0000002
#define ECHO 0000010
@ -137,14 +132,11 @@ struct termios
#define TOSTOP 0000400
#define IEXTEN 0100000
/* Extensions? */
#define CBAUDEX 0010000
#define ECHOCTL 0001000
#define ECHOPRT 0002000
#define ECHOKE 0004000
#define FLUSHO 0010000
#define PENDIN 0040000
#define EXTPROC 0200000
#define TCOOFF 0
#define TCOON 1
@ -158,3 +150,10 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0010000
#define CRTSCTS 020000000000
#define EXTPROC 0200000
#define XTABS 0014000
#endif

15
arch/microblaze/bits/termios.h
View File

@ -75,9 +75,6 @@ struct termios
#define VT0 0000000
#define VT1 0040000
/* ?? */
#define XTABS 0014000
#define B0 0000000
#define B50 0000001
#define B75 0000002
@ -125,8 +122,6 @@ struct termios
#define HUPCL 0002000
#define CLOCAL 0004000
#define CRTSCTS 020000000000
#define ISIG 0000001
#define ICANON 0000002
#define ECHO 0000010
@ -137,14 +132,11 @@ struct termios
#define TOSTOP 0000400
#define IEXTEN 0100000
/* Extensions? */
#define CBAUDEX 0010000
#define ECHOCTL 0001000
#define ECHOPRT 0002000
#define ECHOKE 0004000
#define FLUSHO 0010000
#define PENDIN 0040000
#define EXTPROC 0200000
#define TCOOFF 0
#define TCOON 1
@ -158,3 +150,10 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0010000
#define CRTSCTS 020000000000
#define EXTPROC 0200000
#define XTABS 0014000
#endif

23
arch/mips/bits/termios.h
View File

@ -77,9 +77,6 @@ struct termios
#define VT0 0000000
#define VT1 0040000
/* ?? */
#define XTABS 0014000
#define B0 0000000
#define B50 0000001
#define B75 0000002
@ -129,12 +126,6 @@ struct termios
#define PARODD 0001000
#define HUPCL 0002000
#define CLOCAL 0004000
#define CBAUDEX 0010000
#define CIBAUD 002003600000
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
#define IBSHIFT 16
#define ISIG 0000001
#define ICANON 0000002
@ -152,9 +143,6 @@ struct termios
#define PENDIN 0040000
#define TOSTOP 0100000
#define ITOSTOP 0100000
#define EXTPROC 0200000
#define TIOCSER_TEMT 1
#define TCOOFF 0
#define TCOON 1
@ -168,3 +156,14 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0010000
#define CIBAUD 002003600000
#define IBSHIFT 16
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
#define EXTPROC 0200000
#define XTABS 0014000
#define TIOCSER_TEMT 1
#endif

18
arch/powerpc/bits/termios.h
View File

@ -66,7 +66,6 @@ struct termios
#define TAB1 00002000
#define TAB2 00004000
#define TAB3 00006000
#define XTABS 00006000
#define CRDLY 00030000
#define CR0 00000000
#define CR1 00010000
@ -101,7 +100,6 @@ struct termios
#define B38400 0000017
#define EXTA B19200
#define EXTB B38400
#define CBAUDEX 0000000
#define B57600 00020
#define B115200 00021
#define B230400 00022
@ -120,9 +118,6 @@ struct termios
#define B4000000 00036
#define BOTHER 00037
#define CIBAUD 077600000
#define IBSHIFT 16
#define CSIZE 00001400
#define CS5 00000000
#define CS6 00000400
@ -136,8 +131,6 @@ struct termios
#define HUPCL 00040000
#define CLOCAL 00100000
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
#define ISIG 0x00000080
#define ICANON 0x00000100
@ -154,7 +147,6 @@ struct termios
#define FLUSHO 0x00800000
#define PENDIN 0x20000000
#define IEXTEN 0x00000400
#define EXTPROC 0x10000000
#define TCOOFF 0
#define TCOON 1
@ -168,3 +160,13 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0000000
#define CIBAUD 077600000
#define IBSHIFT 16
#define CMSPAR 010000000000
#define CRTSCTS 020000000000
#define EXTPROC 0x10000000
#define XTABS 00006000
#endif

15
arch/x86_64/bits/termios.h
View File

@ -75,9 +75,6 @@ struct termios
#define VT0 0000000
#define VT1 0040000
/* ?? */
#define XTABS 0014000
#define B0 0000000
#define B50 0000001
#define B75 0000002
@ -125,8 +122,6 @@ struct termios
#define HUPCL 0002000
#define CLOCAL 0004000
#define CRTSCTS 020000000000
#define ISIG 0000001
#define ICANON 0000002
#define ECHO 0000010
@ -137,14 +132,11 @@ struct termios
#define TOSTOP 0000400
#define IEXTEN 0100000
/* Extensions? */
#define CBAUDEX 0010000
#define ECHOCTL 0001000
#define ECHOPRT 0002000
#define ECHOKE 0004000
#define FLUSHO 0010000
#define PENDIN 0040000
#define EXTPROC 0200000
#define TCOOFF 0
#define TCOON 1
@ -158,3 +150,10 @@ struct termios
#define TCSANOW 0
#define TCSADRAIN 1
#define TCSAFLUSH 2
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define CBAUDEX 0010000
#define CRTSCTS 020000000000
#define EXTPROC 0200000
#define XTABS 0014000
#endif