diff options
| author | Rich Felker <dalias@aerifal.cx> | 2018-03-10 18:08:02 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-03-10 18:19:41 -0500 |
| commit | eb5ae94016f0e3e4fb7d0715346b09335f14655d (patch) | |
| tree | 6b6509f8cff541a147f49aa359791ee60ad711e3 | |
| parent | f9c2498fee1c94adf00e788863d2d4544d1d1ec0 (diff) | |
| download | musl-eb5ae94016f0e3e4fb7d0715346b09335f14655d.tar.gz musl-eb5ae94016f0e3e4fb7d0715346b09335f14655d.tar.xz musl-eb5ae94016f0e3e4fb7d0715346b09335f14655d.zip | |
fix minor namespace issues in termios.h
the output delay features (NL*, CR*, TAB*, BS*, and VT*) are XSI-shaded. VT* is in the V* namespace reservation but the rest need to be suppressed in base POSIX namespace. unfortunately this change introduces feature test macro checks into another bits header. at some point these checks should be simplified by having features.h handle the "FTM X implies Y" relationships.
| -rw-r--r-- | arch/generic/bits/termios.h | 2 | ||||
| -rw-r--r-- | arch/mips/bits/termios.h | 2 | ||||
| -rw-r--r-- | arch/mips64/bits/termios.h | 2 | ||||
| -rw-r--r-- | arch/mipsn32/bits/termios.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/bits/termios.h | 2 | ||||
| -rw-r--r-- | arch/powerpc64/bits/termios.h | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h index 434c02c8..124f71d2 100644 --- a/arch/generic/bits/termios.h +++ b/arch/generic/bits/termios.h @@ -51,6 +51,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0000400 #define NL0 0000000 #define NL1 0000400 @@ -70,6 +71,7 @@ struct termios { #define FFDLY 0100000 #define FF0 0000000 #define FF1 0100000 +#endif #define VTDLY 0040000 #define VT0 0000000 diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h index 692e58be..f7b9dd2e 100644 --- a/arch/mips/bits/termios.h +++ b/arch/mips/bits/termios.h @@ -52,6 +52,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0000400 #define NL0 0000000 #define NL1 0000400 @@ -71,6 +72,7 @@ struct termios { #define FFDLY 0100000 #define FF0 0000000 #define FF1 0100000 +#endif #define VTDLY 0040000 #define VT0 0000000 diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h index 692e58be..f7b9dd2e 100644 --- a/arch/mips64/bits/termios.h +++ b/arch/mips64/bits/termios.h @@ -52,6 +52,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0000400 #define NL0 0000000 #define NL1 0000400 @@ -71,6 +72,7 @@ struct termios { #define FFDLY 0100000 #define FF0 0000000 #define FF1 0100000 +#endif #define VTDLY 0040000 #define VT0 0000000 diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h index 692e58be..f7b9dd2e 100644 --- a/arch/mipsn32/bits/termios.h +++ b/arch/mipsn32/bits/termios.h @@ -52,6 +52,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0000400 #define NL0 0000000 #define NL1 0000400 @@ -71,6 +72,7 @@ struct termios { #define FFDLY 0100000 #define FF0 0000000 #define FF1 0100000 +#endif #define VTDLY 0040000 #define VT0 0000000 diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h index 5c2f6bfb..e3f22e86 100644 --- a/arch/powerpc/bits/termios.h +++ b/arch/powerpc/bits/termios.h @@ -53,6 +53,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0001400 #define NL0 0000000 #define NL1 0000400 @@ -74,6 +75,7 @@ struct termios { #define BSDLY 0100000 #define BS0 0000000 #define BS1 0100000 +#endif #define VTDLY 0200000 #define VT0 0000000 diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h index 5c2f6bfb..e3f22e86 100644 --- a/arch/powerpc64/bits/termios.h +++ b/arch/powerpc64/bits/termios.h @@ -53,6 +53,7 @@ struct termios { #define ONLRET 0000040 #define OFILL 0000100 #define OFDEL 0000200 +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_XOPEN_SOURCE) #define NLDLY 0001400 #define NL0 0000000 #define NL1 0000400 @@ -74,6 +75,7 @@ struct termios { #define BSDLY 0100000 #define BS0 0000000 #define BS1 0100000 +#endif #define VTDLY 0200000 #define VT0 0000000 |