about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Janda <felix.janda@posteo.de>2015-09-13 23:12:48 +0200
committerRich Felker <dalias@aerifal.cx>2015-09-15 14:28:07 -0400
commitb291e7ca9bf231da3dbb54f598e39e0785afc423 (patch)
tree41e31f8ac890255a08d94cff0cbd3aca18ec25f4
parentd4c82d05b8d0ee97f6356d60986799a95ed5bd74 (diff)
downloadmusl-b291e7ca9bf231da3dbb54f598e39e0785afc423.tar.gz
musl-b291e7ca9bf231da3dbb54f598e39e0785afc423.tar.xz
musl-b291e7ca9bf231da3dbb54f598e39e0785afc423.zip
fix namespace violations in aarch64/bits/termios.h
in analogy with commit a627eb35864d5c29a3c3300dfe83745ab1e7a00f
-rw-r--r--arch/aarch64/bits/termios.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/aarch64/bits/termios.h b/arch/aarch64/bits/termios.h
index 9265d6fc..f0d81b13 100644
--- a/arch/aarch64/bits/termios.h
+++ b/arch/aarch64/bits/termios.h
@@ -76,8 +76,6 @@ struct termios
 #define VT0    0000000
 #define VT1    0040000
 
-#define XTABS  0014000
-
 #define B0       0000000
 #define B50      0000001
 #define B75      0000002
@@ -125,8 +123,6 @@ struct termios
 #define HUPCL  0002000
 #define CLOCAL 0004000
 
-#define CRTSCTS  020000000000
-
 #define ISIG   0000001
 #define ICANON 0000002
 #define ECHO   0000010
@@ -137,14 +133,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 +151,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