Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 3 Jul 2016 17:07:30 +0200
From: Szabolcs Nagy <nsz@...t70.net>
To: musl@...ts.openwall.com
Subject: [PATCH 10/16] fix FIOQSIZE in arm ioctl.h

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 <bits/ioctl_fix.h>
diff --git a/arch/generic/bits/ioctl_fix.h b/arch/generic/bits/ioctl_fix.h
new file mode 100644
index 0000000..e69de29
-- 
2.8.1

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.