diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-30 22:34:33 -0500 |
| commit | 0eb6f47528cc10645cb0a6919b3af53166ca4fe8 (patch) | |
| tree | db61d4a90096b60be41fb33d6d87e79d1d9c3b04 /sysdeps/unix/sysv/linux | |
| parent | 27a25b6e633a3ea071e229337eaae36d0fa243fa (diff) | |
| parent | c8a89e7dd5cab24242cc9050387bd5bb902da11a (diff) | |
| download | glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.zip glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.gz glibc-0eb6f47528cc10645cb0a6919b3af53166ca4fe8.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/epoll_pwait.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/faccessat.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/grantpt.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c index e689073..a9c5b3c 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) diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c index c154deb..bff7a4b 100644 --- a/sysdeps/unix/sysv/linux/faccessat.c +++ b/sysdeps/unix/sysv/linux/faccessat.c @@ -1,5 +1,5 @@ /* Test for access to file, relative to open directory. Linux version. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2009, 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 @@ -114,7 +114,7 @@ faccessat (fd, file, mode, flag) #endif struct stat64 stats; - if (fstatat64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW)) + if (__fxstatat64 (_STAT_VER, fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW)) return -1; mode &= (X_OK | W_OK | R_OK); /* Clear any bogus bits. */ diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c index f2fc60f..0a3cd47 100644 --- a/sysdeps/unix/sysv/linux/grantpt.c +++ b/sysdeps/unix/sysv/linux/grantpt.c @@ -7,7 +7,8 @@ #include <stdlib.h> #include <unistd.h> -#include "not-cancel.h" +#include <not-cancel.h> + #include "pty-private.h" |