From: Chris Metcalf <cmetcalf@tilera.com>
Date: Sat, 28 Jan 2012 17:00:12 +0000 (-0500)
Subject: Use include/sys/epoll.h to provide libc_hidden_proto for epoll_pwait().
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=730ca05f093c53088f1d174ee68f1d8c82e5c998;p=thirdparty%2Fglibc.git

Use include/sys/epoll.h to provide libc_hidden_proto for epoll_pwait().

(cherry picked from commit 463de8625241174b25e339c119d7c59e79b474ec)
---

diff --git a/ChangeLog b/ChangeLog
index 28a6205f544..53ffbe2b53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* sysdeps/unix/sysv/linux/grantpt.c: Use <> brackets for not-cancel.h.
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
new file mode 100644
index 00000000000..ce1c2e26d5f
--- /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 e689073d18f..a9c5b3c511b 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)