aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-01-28 12:00:12 -0500
committerChris Metcalf <cmetcalf@tilera.com>2012-01-31 13:55:42 -0500
commit75d7f451934d073ca01d2421ac8bef338a016ff9 (patch)
treed8ddbeda7de8ae2d30f93e375fec1f06c92684b7
parent35a210cd4018be9332ca717cb6c364c0d092572b (diff)
downloadglibc-75d7f451934d073ca01d2421ac8bef338a016ff9.tar
glibc-75d7f451934d073ca01d2421ac8bef338a016ff9.tar.gz
glibc-75d7f451934d073ca01d2421ac8bef338a016ff9.tar.bz2
glibc-75d7f451934d073ca01d2421ac8bef338a016ff9.zip
Use include/sys/epoll.h to provide libc_hidden_proto for epoll_pwait().
-rw-r--r--ChangeLog6
-rw-r--r--include/sys/epoll.h6
-rw-r--r--sysdeps/unix/sysv/linux/epoll_pwait.c4
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 882af0448a..4bd89ae68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-01-28 Chris Metcalf <cmetcalf@tilera.com>
+ * include/sys/epoll.h: New file.
+ * sysdeps/unix/sysv/linux/epoll_pwait.c (epoll_pwait): Mark as
+ libc_hidden_def.
+
+2012-01-28 Chris Metcalf <cmetcalf@tilera.com>
+
* scripts/firstversions.awk: Fix bug in version range handling.
2012-01-28 Chris Metcalf <cmetcalf@tilera.com>
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
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c
index e689073d18..a9c5b3c511 100644
--- a/sysdeps/unix/sysv/linux/epoll_pwait.c
+++ b/sysdeps/unix/sysv/linux/epoll_pwait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2007, 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -67,3 +67,5 @@ stub_warning (epoll_pwait)
# include <stub-tag.h>
#endif
+
+libc_hidden_def (epoll_pwait)