aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-30 22:34:33 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-30 22:34:33 -0500
commit0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch)
treedb61d4a90096b60be41fb33d6d87e79d1d9c3b04 /include
parent27a25b6e633a3ea071e229337eaae36d0fa243fa (diff)
parentc8a89e7dd5cab24242cc9050387bd5bb902da11a (diff)
downloadglibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.xz
glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'include')
-rw-r--r--include/sys/epoll.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
new file mode 100644
index 0000000000..ce1c2e26d5
--- /dev/null
+++ b/include/sys/epoll.h
@@ -0,0 +1,6 @@
+#ifndef _SYS_EPOLL_H
+#include_next <sys/epoll.h>
+
+libc_hidden_proto (epoll_pwait)
+
+#endif