From 9eda4dc69c33852c97c6f69176bf45ffc80b522f Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Mon, 27 Nov 2017 01:16:14 +0000 Subject: [PATCH] mips,powerpc: fix TIOCSER_TEMT in termios.h use the same token to define TIOCSER_TEMT as is used in ioctl.h so when both headers are included there are no redefinition warnings during musl build. --- 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