From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 10 Mar 2018 23:08:02 +0000 (-0500)
Subject: fix minor namespace issues in termios.h
X-Git-Tag: v1.1.20~135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb5ae94016f0e3e4fb7d0715346b09335f14655d;p=oweals%2Fmusl.git

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 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