about summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2016-07-03 17:07:30 +0200
committerRich Felker <dalias@aerifal.cx>2016-07-03 14:54:35 -0400
commitcd208b0037c60da625fdd1f6a1459bc37115aacd (patch)
treeb9dcffc247d37b11a49a65473a0160bc2f292c2e /arch
parent6fce6ca129c34d8975f777216d32cf92e77c18f2 (diff)
downloadmusl-cd208b0037c60da625fdd1f6a1459bc37115aacd.tar.gz
musl-cd208b0037c60da625fdd1f6a1459bc37115aacd.tar.xz
musl-cd208b0037c60da625fdd1f6a1459bc37115aacd.zip
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.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/bits/ioctl_fix.h2
-rw-r--r--arch/generic/bits/ioctl.h2
-rw-r--r--arch/generic/bits/ioctl_fix.h0
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/bits/ioctl_fix.h b/arch/arm/bits/ioctl_fix.h
new file mode 100644
index 00000000..ebb383da
--- /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 668d467e..c2035fc5 100644
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -200,3 +200,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 00000000..e69de29b
--- /dev/null
+++ b/arch/generic/bits/ioctl_fix.h