From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12139 Path: news.gmane.org!.POSTED!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] mips,powerpc: fix TIOCSER_TEMT in termios.h Date: Mon, 27 Nov 2017 02:37:37 +0100 Message-ID: <20171127013737.GI15263@port70.net> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1511746670 14667 195.159.176.226 (27 Nov 2017 01:37:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 27 Nov 2017 01:37:50 +0000 (UTC) User-Agent: Mutt/1.6.0 (2016-04-01) To: musl@lists.openwall.com Original-X-From: musl-return-12155-gllmg-musl=m.gmane.org@lists.openwall.com Mon Nov 27 02:37:46 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1eJ8Mi-0003Kq-Cq for gllmg-musl@m.gmane.org; Mon, 27 Nov 2017 02:37:44 +0100 Original-Received: (qmail 11567 invoked by uid 550); 27 Nov 2017 01:37:49 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 11523 invoked from network); 27 Nov 2017 01:37:49 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline Xref: news.gmane.org gmane.linux.lib.musl.general:12139 Archived-At: use the same token to define TIOCSER_TEMT as in ioctl.h so when both headers are included there are no redefinition warnings during musl build. (other targets have no TIOCSER_TEMT in termios.h, this follows the glibc api) --- arch/mips/bits/termios.h | 2 +- arch/mips64/bits/termios.h | 2 +- arch/mipsn32/bits/termios.h | 2 +- arch/powerpc/bits/termios.h | 2 +- arch/powerpc64/bits/termios.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h index 6a1205d7..692e58be 100644 --- a/arch/mips/bits/termios.h +++ b/arch/mips/bits/termios.h @@ -163,5 +163,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 1 +#define TIOCSER_TEMT 0x01 #endif diff --git a/arch/mips64/bits/termios.h b/arch/mips64/bits/termios.h index 6a1205d7..692e58be 100644 --- a/arch/mips64/bits/termios.h +++ b/arch/mips64/bits/termios.h @@ -163,5 +163,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 1 +#define TIOCSER_TEMT 0x01 #endif diff --git a/arch/mipsn32/bits/termios.h b/arch/mipsn32/bits/termios.h index 6a1205d7..692e58be 100644 --- a/arch/mipsn32/bits/termios.h +++ b/arch/mipsn32/bits/termios.h @@ -163,5 +163,5 @@ struct termios { #define EXTPROC 0200000 #define XTABS 0014000 -#define TIOCSER_TEMT 1 +#define TIOCSER_TEMT 0x01 #endif diff --git a/arch/powerpc/bits/termios.h b/arch/powerpc/bits/termios.h index 0b09630c..5c2f6bfb 100644 --- a/arch/powerpc/bits/termios.h +++ b/arch/powerpc/bits/termios.h @@ -165,5 +165,5 @@ struct termios { #define EXTPROC 0x10000000 #define XTABS 00006000 -#define TIOCSER_TEMT 1 +#define TIOCSER_TEMT 0x01 #endif diff --git a/arch/powerpc64/bits/termios.h b/arch/powerpc64/bits/termios.h index 0b09630c..5c2f6bfb 100644 --- a/arch/powerpc64/bits/termios.h +++ b/arch/powerpc64/bits/termios.h @@ -165,5 +165,5 @@ struct termios { #define EXTPROC 0x10000000 #define XTABS 00006000 -#define TIOCSER_TEMT 1 +#define TIOCSER_TEMT 0x01 #endif -- 2.15.0