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.

diff --git a/arch/generic/bits/termios.h b/arch/generic/bits/termios.h
index 434c02c89aba227093a09d8869ec4bc8eb69ba46..124f71d20196c0ea74ccca054953cc199bad8000 100644 (file)
--- 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 692e58be1c62918a5b6492f1116f0c8b197f8e4f..f7b9dd2e8b5bc55bbaf68ba7341fb48163f04e95 100644 (file)
--- 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 692e58be1c62918a5b6492f1116f0c8b197f8e4f..f7b9dd2e8b5bc55bbaf68ba7341fb48163f04e95 100644 (file)
--- 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 692e58be1c62918a5b6492f1116f0c8b197f8e4f..f7b9dd2e8b5bc55bbaf68ba7341fb48163f04e95 100644 (file)
--- 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 5c2f6bfb03096b3d989d7330fb2eaa262e259726..e3f22e8644c2498dbabf48ee7f45fc1f52c1e6cd 100644 (file)
--- 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 5c2f6bfb03096b3d989d7330fb2eaa262e259726..e3f22e8644c2498dbabf48ee7f45fc1f52c1e6cd 100644 (file)
--- 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