From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10262 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 03/16] remove ioctl macros that were removed from linux uapi Date: Sun, 3 Jul 2016 17:03:19 +0200 Message-ID: <643e7fdb82c02812e6e6efe21f79e780d6b7f84b.1467552244.git.nsz@port70.net> 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 1467558237 28416 80.91.229.3 (3 Jul 2016 15:03:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jul 2016 15:03:57 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-10275-gllmg-musl=m.gmane.org@lists.openwall.com Sun Jul 03 17:03:52 2016 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 1bJiw3-0003O9-PW for gllmg-musl@m.gmane.org; Sun, 03 Jul 2016 17:03:51 +0200 Original-Received: (qmail 17541 invoked by uid 550); 3 Jul 2016 15:03: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 17480 invoked from network); 3 Jul 2016 15:03:43 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Xref: news.gmane.org gmane.linux.lib.musl.general:10262 Archived-At: TIOCTTYGSTRUCT, TIOCGHAYESESP, TIOCSHAYESESP and TIOCM_MODEM_BITS were removed from the linux uapi and not present in glibc ioctl.h --- arch/generic/bits/ioctl.h | 4 ---- arch/mips/bits/ioctl.h | 4 ---- arch/mips64/bits/ioctl.h | 4 ---- arch/mipsn32/bits/ioctl.h | 4 ---- arch/powerpc/bits/ioctl.h | 7 ------- arch/powerpc64/bits/ioctl.h | 7 ------- arch/sh/bits/ioctl.h | 2 -- 7 files changed, 32 deletions(-) diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h index df0d944..acd9965 100644 --- a/arch/generic/bits/ioctl.h +++ b/arch/generic/bits/ioctl.h @@ -46,7 +46,6 @@ #define TIOCSETD 0x5423 #define TIOCGETD 0x5424 #define TCSBRKP 0x5425 -#define TIOCTTYGSTRUCT 0x5426 #define TIOCSBRK 0x5427 #define TIOCCBRK 0x5428 #define TIOCGSID 0x5429 @@ -72,8 +71,6 @@ #define TIOCMIWAIT 0x545C #define TIOCGICOUNT 0x545D -#define TIOCGHAYESESP 0x545E -#define TIOCSHAYESESP 0x545F #define FIOQSIZE 0x5460 #define TIOCPKT_DATA 0 @@ -108,7 +105,6 @@ struct winsize { #define TIOCM_OUT1 0x2000 #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -#define TIOCM_MODEM_BITS TIOCM_OUT2 #define N_TTY 0 #define N_SLIP 1 diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h index 4687d21..ee9cdb1 100644 --- a/arch/mips/bits/ioctl.h +++ b/arch/mips/bits/ioctl.h @@ -80,10 +80,7 @@ #define TIOCSERSETMULTI 0x5490 #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TIOCGHAYESESP 0x5493 -#define TIOCSHAYESESP 0x5494 -#define TIOCTTYGSTRUCT 0x5426 // RICH: Not sure about these. #define TCGETX 0x5432 // RICH: Not sure about these. #define TCSETX 0x5433 // RICH: Not sure about these. #define TCSETXF 0x5434 // RICH: Not sure about these. @@ -121,7 +118,6 @@ struct winsize { #define TIOCM_OUT1 0x2000 #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -#define TIOCM_MODEM_BITS TIOCM_OUT2 #define N_TTY 0 #define N_SLIP 1 diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h index 60c99ba..e00e3d4 100644 --- a/arch/mips64/bits/ioctl.h +++ b/arch/mips64/bits/ioctl.h @@ -80,10 +80,7 @@ #define TIOCSERSETMULTI 0x5490 #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TIOCGHAYESESP 0x5493 -#define TIOCSHAYESESP 0x5494 -#define TIOCTTYGSTRUCT 0x5426 #define TCGETX 0x5432 #define TCSETX 0x5433 #define TCSETXF 0x5434 @@ -121,7 +118,6 @@ struct winsize { #define TIOCM_OUT1 0x2000 #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -#define TIOCM_MODEM_BITS TIOCM_OUT2 #define N_TTY 0 #define N_SLIP 1 diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h index 60c99ba..e00e3d4 100644 --- a/arch/mipsn32/bits/ioctl.h +++ b/arch/mipsn32/bits/ioctl.h @@ -80,10 +80,7 @@ #define TIOCSERSETMULTI 0x5490 #define TIOCMIWAIT 0x5491 #define TIOCGICOUNT 0x5492 -#define TIOCGHAYESESP 0x5493 -#define TIOCSHAYESESP 0x5494 -#define TIOCTTYGSTRUCT 0x5426 #define TCGETX 0x5432 #define TCSETX 0x5433 #define TCSETXF 0x5434 @@ -121,7 +118,6 @@ struct winsize { #define TIOCM_OUT1 0x2000 #define TIOCM_OUT2 0x4000 #define TIOCM_LOOP 0x8000 -#define TIOCM_MODEM_BITS TIOCM_OUT2 #define N_TTY 0 #define N_SLIP 1 diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h index a2a845a..94b9ed0 100644 --- a/arch/powerpc/bits/ioctl.h +++ b/arch/powerpc/bits/ioctl.h @@ -120,16 +120,11 @@ /* end kernel header ioctls.h */ -#define TIOCTTYGSTRUCT 0x5426 - #define TCGETX 0x5432 #define TCSETX 0x5433 #define TCSETXF 0x5434 #define TCSETXW 0x5435 -#define TIOCGHAYESESP 0x545E -#define TIOCSHAYESESP 0x545F - struct winsize { unsigned short ws_row; unsigned short ws_col; @@ -137,8 +132,6 @@ struct winsize { unsigned short ws_ypixel; }; -#define TIOCM_MODEM_BITS TIOCM_OUT2 - #define N_TTY 0 #define N_SLIP 1 #define N_MOUSE 2 diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h index 0d70dc1..0640eef 100644 --- a/arch/powerpc64/bits/ioctl.h +++ b/arch/powerpc64/bits/ioctl.h @@ -123,16 +123,11 @@ /* end kernel header ioctls.h */ -#define TIOCTTYGSTRUCT 0x5426 - #define TCGETX 0x5432 #define TCSETX 0x5433 #define TCSETXF 0x5434 #define TCSETXW 0x5435 -#define TIOCGHAYESESP 0x545E -#define TIOCSHAYESESP 0x545F - struct winsize { unsigned short ws_row; unsigned short ws_col; @@ -140,8 +135,6 @@ struct winsize { unsigned short ws_ypixel; }; -#define TIOCM_MODEM_BITS TIOCM_OUT2 - #define N_TTY 0 #define N_SLIP 1 #define N_MOUSE 2 diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h index 73fb55c..6157983 100644 --- a/arch/sh/bits/ioctl.h +++ b/arch/sh/bits/ioctl.h @@ -119,8 +119,6 @@ struct winsize { unsigned short ws_ypixel; }; -#define TIOCM_MODEM_BITS TIOCM_OUT2 - #define N_TTY 0 #define N_SLIP 1 #define N_MOUSE 2 -- 2.8.1