From: Felix Janda <felix.janda@posteo.de>
To: musl@lists.openwall.com
Subject: [PATCH 1/2] fix namespace violations in aarch64/bits/termios.h
Date: Sun, 13 Sep 2015 23:12:48 +0200 [thread overview]
Message-ID: <20150913211248.GB7342@nyan> (raw)
In-Reply-To: <cover.1442178400.git.felix.janda@posteo.de>
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
next prev parent reply other threads:[~2015-09-13 21:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-13 21:06 [PATCH 0/2] bits/termios.h deduplication Felix Janda
2015-09-13 21:12 ` Felix Janda [this message]
2015-09-13 21:35 ` [PATCH 1/2] fix namespace violations in aarch64/bits/termios.h Szabolcs Nagy
2015-09-13 21:13 ` [PATCH 2/2] reindent powerpc's bits/termios.h to be consistent with other archs Felix Janda
2015-09-15 18:33 ` Rich Felker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150913211248.GB7342@nyan \
--to=felix.janda@posteo.de \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).