From b291e7ca9bf231da3dbb54f598e39e0785afc423 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sun, 13 Sep 2015 23:12:48 +0200 Subject: [PATCH] fix namespace violations in aarch64/bits/termios.h in analogy with commit a627eb35864d5c29a3c3300dfe83745ab1e7a00f --- arch/aarch64/bits/termios.h | 14 +++++++------- 1 file 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 -- 2.25.1