From: Chris Metcalf <cmetcalf@tilera.com>
Date: Mon, 30 Jan 2012 17:40:37 +0000 (-0500)
Subject: Remove libc_hidden_proto in sysdeps/unix/sysv/linux/generic/epoll_wait.c.
X-Git-Tag: glibc-2.16-ports-before-merge~302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8525497961ef5979a2a14faee4324914230092e7;p=thirdparty%2Fglibc.git

Remove libc_hidden_proto in sysdeps/unix/sysv/linux/generic/epoll_wait.c.
---

diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 4a0b9084c5a..83a2db19330 100644
--- a/ChangeLog.linux-generic
+++ b/ChangeLog.linux-generic
@@ -1,3 +1,8 @@
+2012-01-30  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove
+	libc_hidden_proto declaration now it's in sys/epoll.h override.
+
 2011-12-09  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* sysdeps/unix/sysv/linux/generic/bits/msq.h: New file.
diff --git a/sysdeps/unix/sysv/linux/generic/epoll_wait.c b/sysdeps/unix/sysv/linux/generic/epoll_wait.c
index eda64bc946e..0fa06e8e39f 100644
--- a/sysdeps/unix/sysv/linux/generic/epoll_wait.c
+++ b/sysdeps/unix/sysv/linux/generic/epoll_wait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
@@ -22,8 +22,6 @@
 #include <sys/types.h>
 #include <sys/epoll.h>
 
-libc_hidden_proto (epoll_pwait)
-
 int
 epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
 {