diff options
| author | Rich Felker <dalias@aerifal.cx> | 2014-01-08 19:20:55 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2014-01-08 19:20:55 -0500 |
| commit | a627eb35864d5c29a3c3300dfe83745ab1e7a00f (patch) | |
| tree | 874aeaaa0495ec153881c6c78c3ec913acc0a92d /arch/i386 | |
| parent | acde013522fc264f0898d300cc9d2ff796c1a006 (diff) | |
| download | musl-a627eb35864d5c29a3c3300dfe83745ab1e7a00f.tar.gz musl-a627eb35864d5c29a3c3300dfe83745ab1e7a00f.tar.xz musl-a627eb35864d5c29a3c3300dfe83745ab1e7a00f.zip | |
fix namespace violations in termios.h, at least mostly
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.
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/bits/termios.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/i386/bits/termios.h b/arch/i386/bits/termios.h index 61c888f4..e9494be0 100644 --- a/arch/i386/bits/termios.h +++ b/arch/i386/bits/termios.h @@ -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 |