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

[BZ #961] 

2005-05-22  Dmitry V. Levin  <ldv@altlinux.org>
	[BZ #961]
	* io/sys/sendfile.h: Remove __nonnull from sendfile and sendfile64
	declarations.
This commit is contained in:
Ulrich Drepper 2005-05-23 17:37:21 +00:00
parent ceef26a28a
commit c179df4e93
7 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-22 Dmitry V. Levin <ldv@altlinux.org>
[BZ #961]
* io/sys/sendfile.h: Remove __nonnull from sendfile and sendfile64
declarations.
2005-05-23 Ulrich Drepper <drepper@redhat.com> 2005-05-23 Ulrich Drepper <drepper@redhat.com>
* sunrpc/pm_getport.c (__get_socket): New function. * sunrpc/pm_getport.c (__get_socket): New function.

6
io/sys/sendfile.h
View File

@ -32,19 +32,19 @@ __BEGIN_DECLS
case of error. */ case of error. */
#ifndef __USE_FILE_OFFSET64 #ifndef __USE_FILE_OFFSET64
extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset, extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset,
size_t __count) __THROW __nonnull ((3)); size_t __count) __THROW;
#else #else
# ifdef __REDIRECT_NTH # ifdef __REDIRECT_NTH
extern ssize_t __REDIRECT_NTH (sendfile, extern ssize_t __REDIRECT_NTH (sendfile,
(int __out_fd, int __in_fd, __off64_t *__offset, (int __out_fd, int __in_fd, __off64_t *__offset,
size_t __count), sendfile64) __nonnull ((3)); size_t __count), sendfile64);
# else # else
# define sendfile sendfile64 # define sendfile sendfile64
# endif # endif
#endif #endif
#ifdef __USE_LARGEFILE64 #ifdef __USE_LARGEFILE64
extern ssize_t sendfile64 (int __out_fd, int __in_fd, __off64_t *__offset, extern ssize_t sendfile64 (int __out_fd, int __in_fd, __off64_t *__offset,
size_t __count) __THROW __nonnull ((3)); size_t __count) __THROW;
#endif #endif
__END_DECLS __END_DECLS

6
linuxthreads/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-23 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
[IS_IN_librt] (CENABLE, CDISABLE): Use JUMPTARGET instead of
__librt_*_asynccancel@local.
2005-05-17 Alan Modra <amodra@bigpond.net.au> 2005-05-17 Alan Modra <amodra@bigpond.net.au>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete

6
linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc. /* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003. Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003.
@ -82,8 +82,8 @@
# define CENABLE bl __libc_enable_asynccancel@local # define CENABLE bl __libc_enable_asynccancel@local
# define CDISABLE bl __libc_disable_asynccancel@local # define CDISABLE bl __libc_disable_asynccancel@local
# else # else
# define CENABLE bl __librt_enable_asynccancel@local # define CENABLE bl JUMPTARGET(__librt_enable_asynccancel)
# define CDISABLE bl __librt_disable_asynccancel@local # define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel)
# endif # endif
# ifdef HAVE_TLS_SUPPORT # ifdef HAVE_TLS_SUPPORT

6
nptl/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-23 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
[IS_IN_librt] (CENABLE, CDISABLE): Use JUMPTARGET instead of
__librt_*_asynccancel@local.
2005-05-17 Alan Modra <amodra@bigpond.net.au> 2005-05-17 Alan Modra <amodra@bigpond.net.au>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete

6
nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
View File

@ -1,5 +1,5 @@
/* Cancellable system call stubs. Linux/PowerPC version. /* Cancellable system call stubs. Linux/PowerPC version.
Copyright (C) 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003. Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003.
@ -91,8 +91,8 @@
# define CENABLE bl __libc_enable_asynccancel@local # define CENABLE bl __libc_enable_asynccancel@local
# define CDISABLE bl __libc_disable_asynccancel@local # define CDISABLE bl __libc_disable_asynccancel@local
# elif defined IS_IN_librt # elif defined IS_IN_librt
# define CENABLE bl __librt_enable_asynccancel@local # define CENABLE bl JUMPTARGET(__librt_enable_asynccancel)
# define CDISABLE bl __librt_disable_asynccancel@local # define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel)
# else # else
# error Unsupported library # error Unsupported library
# endif # endif

2
sunrpc/pm_getmaps.c
View File

@ -67,7 +67,7 @@ pmap_getmaps (struct sockaddr_in *address)
minutetimeout.tv_usec = 0; minutetimeout.tv_usec = 0;
address->sin_port = htons (PMAPPORT); address->sin_port = htons (PMAPPORT);
/* Don't need a reserver port to get ports from the portmapper */ /* Don't need a reserved port to get ports from the portmapper. */
int socket = __get_socket (address); int socket = __get_socket (address);
if (socket != -1) if (socket != -1)
closeit = true; closeit = true;