qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

This commit is contained in:
Steve Ellcey 2012-10-29 11:41:36 -07:00
parent 55e64efadf 94ce799f82
commit 4172907b3d
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2012-10-29 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/hurd/fdatasync.c: Turn ERR into EINVAL if it is
EOPNOTSUPP.
* sysdeps/mach/hurd/fsync.c: Likewise.
* sysdeps/pthread/aio_notify.c (__aio_notify_only)
[_POSIX_REALTIME_SIGNALS]: Change condition to
[_POSIX_REALTIME_SIGNALS > 0].
2012-10-27 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/x86/bits/fcntl.h (__O_LARGEFILE)

8
sysdeps/mach/hurd/fdatasync.c
View File

@ -26,6 +26,12 @@ fdatasync (int fd)
{
error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 1));
if (err)
return __hurd_dfail (fd, err);
{
if (err == EOPNOTSUPP)
/* If the file descriptor does not support sync, return EINVAL
as POSIX specifies. */
err = EINVAL;
return __hurd_dfail (fd, err);
}
return 0;
}

8
sysdeps/mach/hurd/fsync.c
View File

@ -27,6 +27,12 @@ fsync (fd)
{
error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 0));
if (err)
return __hurd_dfail (fd, err);
{
if (err == EOPNOTSUPP)
/* If the file descriptor does not support sync, return EINVAL
as POSIX specifies. */
err = EINVAL;
return __hurd_dfail (fd, err);
}
return 0;
}

2
sysdeps/pthread/aio_notify.c
View File

@ -95,7 +95,7 @@ __aio_notify_only (struct sigevent *sigev)
else if (sigev->sigev_notify == SIGEV_SIGNAL)
{
/* We have to send a signal. */
#if _POSIX_REALTIME_SIGNALS
#if _POSIX_REALTIME_SIGNALS > 0
/* Note that the standard gives us the option of using a plain
non-queuing signal here when SA_SIGINFO is not set for the signal. */
# ifdef BROKEN_THREAD_SIGNALS