diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:50:40 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-01-30 09:50:40 -0800 |
| commit | ee3c3be688072b7d8808034f1d895eabe560274b (patch) | |
| tree | 64f115681766d8165b28b02088b53876324e4a37 | |
| parent | de9298c991eba226e15e99f39f2d66bd4d219f62 (diff) | |
| parent | 463de8625241174b25e339c119d7c59e79b474ec (diff) | |
| download | glibc-ee3c3be688072b7d8808034f1d895eabe560274b.tar.gz glibc-ee3c3be688072b7d8808034f1d895eabe560274b.tar.xz glibc-ee3c3be688072b7d8808034f1d895eabe560274b.zip | |
Merge remote-tracking branch 'origin/cmetcalf/tile_epoll_pwait'
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/sys/epoll.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/epoll_pwait.c | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 7073727dbb..72641f2cdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,10 @@ * sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64. + * include/sys/epoll.h: New file. + * sysdeps/unix/sysv/linux/epoll_pwait.c (epoll_pwait): Mark as + libc_hidden_def. + 2012-01-28 Ulrich Drepper <drepper@gmail.com> * sysdeps/x86_64/fpu/bits/mathinline.h (__signbitl): Optimize a bit. 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) |