From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/8503 Path: news.gmane.org!not-for-mail From: Felix Janda Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 1/2] fix namespace violations in aarch64/bits/termios.h Date: Sun, 13 Sep 2015 23:12:48 +0200 Message-ID: <20150913211248.GB7342@nyan> References: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442179056 21055 80.91.229.3 (13 Sep 2015 21:17:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Sep 2015 21:17:36 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-8515-gllmg-musl=m.gmane.org@lists.openwall.com Sun Sep 13 23:17:36 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1ZbEeU-0001T9-T3 for gllmg-musl@m.gmane.org; Sun, 13 Sep 2015 23:17:35 +0200 Original-Received: (qmail 8057 invoked by uid 550); 13 Sep 2015 21:17:32 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 7825 invoked from network); 13 Sep 2015 21:17:23 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Xref: news.gmane.org gmane.linux.lib.musl.general:8503 Archived-At: 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 9265d6f..f0d81b1 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.4.6