summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrutz Behn <me@trutz.be>2015-02-13 18:10:52 +0100
committerRich Felker <dalias@aerifal.cx>2015-03-04 12:09:37 -0500
commitf5011c62c3329f15652a60b6b2300d7e3f570977 (patch)
treee26da4a3422fd02af6ac0f8e993c6240f1fad7a3
parente7b9887e8b65253087ab0b209dc8dd85c9f09614 (diff)
downloadmusl-f5011c62c3329f15652a60b6b2300d7e3f570977.tar.gz
fix POLLWRNORM and POLLWRBAND on mips
these macros have the same distinct definition on blackfin, frv, m68k, mips, sparc and xtensa kernels. POLLMSG and POLLRDHUP additionally differ on sparc.
-rw-r--r--arch/arm/bits/poll.h0
-rw-r--r--arch/i386/bits/poll.h0
-rw-r--r--arch/microblaze/bits/poll.h0
-rw-r--r--arch/mips/bits/poll.h2
-rw-r--r--arch/or1k/bits/poll.h0
-rw-r--r--arch/powerpc/bits/poll.h0
-rw-r--r--arch/sh/bits/poll.h0
-rw-r--r--arch/x32/bits/poll.h0
-rw-r--r--arch/x86_64/bits/poll.h0
-rw-r--r--include/poll.h6
10 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/bits/poll.h b/arch/arm/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/arm/bits/poll.h
diff --git a/arch/i386/bits/poll.h b/arch/i386/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/i386/bits/poll.h
diff --git a/arch/microblaze/bits/poll.h b/arch/microblaze/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/microblaze/bits/poll.h
diff --git a/arch/mips/bits/poll.h b/arch/mips/bits/poll.h
new file mode 100644
index 00000000..b0b1ed62
--- /dev/null
+++ b/arch/mips/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 0x100
diff --git a/arch/or1k/bits/poll.h b/arch/or1k/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/or1k/bits/poll.h
diff --git a/arch/powerpc/bits/poll.h b/arch/powerpc/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/powerpc/bits/poll.h
diff --git a/arch/sh/bits/poll.h b/arch/sh/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/sh/bits/poll.h
diff --git a/arch/x32/bits/poll.h b/arch/x32/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/x32/bits/poll.h
diff --git a/arch/x86_64/bits/poll.h b/arch/x86_64/bits/poll.h
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/arch/x86_64/bits/poll.h
diff --git a/include/poll.h b/include/poll.h
index 9a785307..5979f7ab 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -7,6 +7,8 @@ extern "C" {
#include <features.h>
+#include <bits/poll.h>
+
#define POLLIN 0x001
#define POLLPRI 0x002
#define POLLOUT 0x004
@@ -15,10 +17,14 @@ extern "C" {
#define POLLNVAL 0x020
#define POLLRDNORM 0x040
#define POLLRDBAND 0x080
+#ifndef POLLWRNORM
#define POLLWRNORM 0x100
#define POLLWRBAND 0x200
+#endif
+#ifndef POLLMSG
#define POLLMSG 0x400
#define POLLRDHUP 0x2000
+#define
typedef unsigned long nfds_t;