mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Felix Fietkau <nbd@openwrt.org>
To: musl@lists.openwall.com
Subject: [PATCH] fix termios custom speed field names
Date: Sun, 13 Sep 2015 18:47:38 +0200	[thread overview]
Message-ID: <1442162858-4004-1-git-send-email-nbd@openwrt.org> (raw)

Using c_ispeed/c_ospeed is necessary for setting custom baud rates not
covered by the existing defines (via BOTHER).
Rename those fields to match glibc/uClibc.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 arch/aarch64/bits/termios.h    | 4 ++--
 arch/arm/bits/termios.h        | 4 ++--
 arch/i386/bits/termios.h       | 4 ++--
 arch/microblaze/bits/termios.h | 4 ++--
 arch/mips/bits/termios.h       | 4 ++--
 arch/or1k/bits/termios.h       | 4 ++--
 arch/powerpc/bits/termios.h    | 4 ++--
 arch/sh/bits/termios.h         | 4 ++--
 arch/x32/bits/termios.h        | 4 ++--
 arch/x86_64/bits/termios.h     | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/aarch64/bits/termios.h b/arch/aarch64/bits/termios.h
index 9265d6f..098322a 100644
--- a/arch/aarch64/bits/termios.h
+++ b/arch/aarch64/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/arm/bits/termios.h b/arch/arm/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/arm/bits/termios.h
+++ b/arch/arm/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/i386/bits/termios.h b/arch/i386/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/i386/bits/termios.h
+++ b/arch/i386/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/microblaze/bits/termios.h b/arch/microblaze/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/microblaze/bits/termios.h
+++ b/arch/microblaze/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h
index 487c1d4..8c4ec62 100644
--- a/arch/mips/bits/termios.h
+++ b/arch/mips/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/or1k/bits/termios.h b/arch/or1k/bits/termios.h
index da26644..61f5c6c 100644
--- a/arch/or1k/bits/termios.h
+++ b/arch/or1k/bits/termios.h
@@ -5,8 +5,8 @@ struct termios {
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h
index 9f8016c..2cd7f1e 100644
--- a/arch/powerpc/bits/termios.h
+++ b/arch/powerpc/bits/termios.h
@@ -8,8 +8,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_cc[NCCS];
 	cc_t c_line;
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR		0
diff --git a/arch/sh/bits/termios.h b/arch/sh/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/sh/bits/termios.h
+++ b/arch/sh/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/x32/bits/termios.h b/arch/x32/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/x32/bits/termios.h
+++ b/arch/x32/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
diff --git a/arch/x86_64/bits/termios.h b/arch/x86_64/bits/termios.h
index f0d81b1..fcd7f9d 100644
--- a/arch/x86_64/bits/termios.h
+++ b/arch/x86_64/bits/termios.h
@@ -6,8 +6,8 @@ struct termios
 	tcflag_t c_lflag;
 	cc_t c_line;
 	cc_t c_cc[NCCS];
-	speed_t __c_ispeed;
-	speed_t __c_ospeed;
+	speed_t c_ispeed;
+	speed_t c_ospeed;
 };
 
 #define VINTR     0
-- 
2.2.2



             reply	other threads:[~2015-09-13 16:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-13 16:47 Felix Fietkau [this message]
2015-09-13 16:58 ` 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=1442162858-4004-1-git-send-email-nbd@openwrt.org \
    --to=nbd@openwrt.org \
    --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).