diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:34:06 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:34:06 +0200 |
commit | 6772d640a4f4874166a61f1859e1660a2913a89d (patch) | |
tree | 839fea4d5dcefab75577cecb563ccad4234eb953 /sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S | |
parent | f98906bbb57cb495b4501afc5f18604ef3a94e2a (diff) | |
parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) |
Merge commit 'refs/top-bases/t/hurdsig-fixes' into t/hurdsig-fixes
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S index 0e8d7ff894..f697e5bd06 100644 --- a/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S +++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2015 Free Software Foundation, Inc. +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -17,4 +17,4 @@ <http://www.gnu.org/licenses/>. */ #define HAVE_CMOV 1 -#include "../i486/pthread_cond_timedwait.S" +#include "../pthread_cond_timedwait.S" |