aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-01-30 09:50:40 -0800
committerRoland McGrath <roland@hack.frob.com>2012-01-30 09:50:40 -0800
commitee3c3be688072b7d8808034f1d895eabe560274b (patch)
tree64f115681766d8165b28b02088b53876324e4a37 /include
parentde9298c991eba226e15e99f39f2d66bd4d219f62 (diff)
parent463de8625241174b25e339c119d7c59e79b474ec (diff)
downloadglibc-ee3c3be688072b7d8808034f1d895eabe560274b.tar.xz
glibc-ee3c3be688072b7d8808034f1d895eabe560274b.zip
Merge remote-tracking branch 'origin/cmetcalf/tile_epoll_pwait'
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