diff options
author | Roland McGrath <roland@gnu.org> | 2002-06-05 08:56:41 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2002-06-05 08:56:41 +0000 |
commit | 7db20e36c819dc7b5973f724da43b778321ea62e (patch) | |
tree | c955fdbff29c041d481f090d345cbe4fff7b0636 /sysdeps/unix/sysv/linux | |
parent | 17d7201a97152b459fad11291de16cf0e6485cfa (diff) | |
download | glibc-7db20e36c819dc7b5973f724da43b778321ea62e.tar glibc-7db20e36c819dc7b5973f724da43b778321ea62e.tar.gz glibc-7db20e36c819dc7b5973f724da43b778321ea62e.tar.bz2 glibc-7db20e36c819dc7b5973f724da43b778321ea62e.zip |
* io/Makefile (routines): Add sendfile and sendfile64.
(headers): Add sys/sendfile.h to the list.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Don't add it here.
* sysdeps/unix/sysv/linux/sys/sendfile.h: Moved to ...
* io/sys/sendfile.h: ... here.
* sysdeps/generic/sendfile.c: New file.
* sysdeps/generic/sendfile64.c: New file.
* sysdeps/unix/sysv/linux/Versions (GLIBC_2.1, GLIBC_2.3):
Move sendfile, sendfile64 to ...
* io/Versions (GLIBC_2.1, GLIBC_2.3): ... here.
* sysdeps/mach/hurd/sendfile.c: New file.
* sysdeps/mach/hurd/sendfile64.c: New file.
* sysdeps/mach/nanosleep.c: New file.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/Versions | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/sendfile.h | 49 |
3 files changed, 1 insertions, 55 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 99950086e7..68e9a1ea4c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -20,7 +20,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ sys/kd.h sys/soundcard.h sys/vt.h \ sys/quota.h sys/fsuid.h \ scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \ - sys/ultrasound.h sys/sendfile.h sys/raw.h + sys/ultrasound.h sys/raw.h install-others += $(inst_includedir)/bits/syscall.h diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 2a90387f82..53cd880425 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -73,9 +73,6 @@ libc { # n* ntp_adjtime; ntp_gettime; - # s* - sendfile; - # u* umount2; } @@ -93,8 +90,6 @@ libc { GLIBC_2.3 { # r* readahead; - # s* - sendfile64; } GLIBC_PRIVATE { # needed by libpthread. diff --git a/sysdeps/unix/sysv/linux/sys/sendfile.h b/sysdeps/unix/sysv/linux/sys/sendfile.h deleted file mode 100644 index 5a6fc770de..0000000000 --- a/sysdeps/unix/sysv/linux/sys/sendfile.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (C) 1998, 1999, 2001, 2002 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _SYS_SENDFILE_H -#define _SYS_SENDFILE_H 1 - -#include <features.h> -#include <sys/types.h> - -__BEGIN_DECLS - -/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to - descriptor OUT_FD. */ -#ifndef __USE_FILE_OFFSET64 -extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset, - size_t __count) __THROW; -#else -# ifdef __REDIRECT -extern ssize_t __REDIRECT (sendfile, - (int __out_fd, int __in_fd, __off64_t *__offset, - size_t __count) __THROW, - sendfile64); -# else -# define sendfile sendfile64 -# endif -#endif -#ifdef __USE_LARGEFILE64 -extern ssize_t sendfile64 (int __out_fd, int __in_fd, __off64_t *__offset, - size_t __count) __THROW; -#endif - -__END_DECLS - -#endif /* sys/sendfile.h */ |