From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/9876 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH 10/16] fix FIOQSIZE in arm ioctl.h Date: Sun, 10 Apr 2016 14:13:48 +0200 Message-ID: <103a2f47a03ed06fda7856e1eceeda52162bb231.1460250248.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 1460290474 25027 80.91.229.3 (10 Apr 2016 12:14:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 10 Apr 2016 12:14:34 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-9889-gllmg-musl=m.gmane.org@lists.openwall.com Sun Apr 10 14:14:33 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 1apEG9-0000O8-Ip for gllmg-musl@m.gmane.org; Sun, 10 Apr 2016 14:14:33 +0200 Original-Received: (qmail 26160 invoked by uid 550); 10 Apr 2016 12:14:31 -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 25669 invoked from network); 10 Apr 2016 12:14:00 -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:9876 Archived-At: arm ioctl.h is the same as the generic one except this macro, so a workaround solution is used to avoid another ioctl.h copy. --- arch/arm/bits/ioctl_fix.h | 2 ++ arch/generic/bits/ioctl.h | 2 ++ arch/generic/bits/ioctl_fix.h | 0 3 files changed, 4 insertions(+) create mode 100644 arch/arm/bits/ioctl_fix.h create mode 100644 arch/generic/bits/ioctl_fix.h diff --git a/arch/arm/bits/ioctl_fix.h b/arch/arm/bits/ioctl_fix.h new file mode 100644 index 0000000..ebb383d --- /dev/null +++ b/arch/arm/bits/ioctl_fix.h @@ -0,0 +1,2 @@ +#undef FIOQSIZE +#define FIOQSIZE 0x545e diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h index 649cdfc..ad5b6d6 100644 --- a/arch/generic/bits/ioctl.h +++ b/arch/generic/bits/ioctl.h @@ -193,3 +193,5 @@ struct winsize { #define SIOCDEVPRIVATE 0x89F0 #define SIOCPROTOPRIVATE 0x89E0 + +#include diff --git a/arch/generic/bits/ioctl_fix.h b/arch/generic/bits/ioctl_fix.h new file mode 100644 index 0000000..e69de29 -- 2.7.2