about summary refs log tree commit diff
path: root/sysdeps
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 /sysdeps
parentde9298c991eba226e15e99f39f2d66bd4d219f62 (diff)
parent463de8625241174b25e339c119d7c59e79b474ec (diff)
downloadglibc-ee3c3be688072b7d8808034f1d895eabe560274b.tar.gz
glibc-ee3c3be688072b7d8808034f1d895eabe560274b.tar.xz
glibc-ee3c3be688072b7d8808034f1d895eabe560274b.zip
Merge remote-tracking branch 'origin/cmetcalf/tile_epoll_pwait'
Conflicts:
	ChangeLog
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/epoll_pwait.c4
1 files changed, 3 insertions, 1 deletions
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)