diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-30 23:23:41 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-30 23:23:41 +0400 |
| commit | d6177bbbd17ddd3f837485f6cb59e24fbc7f82c5 (patch) | |
| tree | 009c30637db1e59410942e9f447f9e310da859e5 /sysdeps/unix/sysv/linux/epoll_pwait.c | |
| parent | 411498f0cc1bfe8762a4d999ac2761a70c305113 (diff) | |
| parent | 344e61df0200af758e794b9843ffb37bd89e5259 (diff) | |
| download | glibc-d6177bbbd17ddd3f837485f6cb59e24fbc7f82c5.tar.gz | |
Merge branch 'release/2.19/master' of git://sourceware.org/git/glibc
Conflicts:
configure.in
include/features.h
io/ftw.c
malloc/arena.c
malloc/malloc.c
malloc/mtrace.c
nptl/allocatestack.c
nptl/nptl-init.c
nptl/pthread_attr_init.c
nptl/pthread_create.c
nptl/pthread_detach.c
nptl/pthread_getschedparam.c
nptl/pthread_setschedparam.c
nptl/pthread_setschedprio.c
nptl/pthread_timedjoin.c
nptl/pthread_tryjoin.c
nptl/sysdeps/unix/sysv/linux/fork.h
nptl/sysdeps/unix/sysv/linux/register-atfork.c
nptl/sysdeps/unix/sysv/linux/unregister-atfork.c
nptl/sysdeps/x86_64/tls.h
nscd/Makefile
sysdeps/unix/inet/syscalls.list
sysdeps/unix/opendir.c
sysdeps/x86_64/multiarch/strcasestr-nonascii.c
Diffstat (limited to 'sysdeps/unix/sysv/linux/epoll_pwait.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/epoll_pwait.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c index 70756e8443..7d98755929 100644 --- a/sysdeps/unix/sysv/linux/epoll_pwait.c +++ b/sysdeps/unix/sysv/linux/epoll_pwait.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007, 2011, 2012 Free Software Foundation, Inc. +/* Copyright (C) 2007-2014 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 @@ -64,7 +64,6 @@ int epoll_pwait (int epfd, struct epoll_event *events, } stub_warning (epoll_pwait) -# include <stub-tag.h> #endif libc_hidden_def (epoll_pwait) |