diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-19 20:57:48 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-19 20:57:48 +0000 |
| commit | e5cd813b4321685f7611fe1031ae1205c6a1a86f (patch) | |
| tree | c5e353c4d68c45b14cf01dc54ebd23ee19841221 /sysdeps/unix/sysv | |
| parent | 6229c88e862c624e41129cf550cbc6d98085d23c (diff) | |
| download | glibc-e5cd813b4321685f7611fe1031ae1205c6a1a86f.tar glibc-e5cd813b4321685f7611fe1031ae1205c6a1a86f.tar.gz glibc-e5cd813b4321685f7611fe1031ae1205c6a1a86f.tar.bz2 glibc-e5cd813b4321685f7611fe1031ae1205c6a1a86f.zip | |
Update.
* dirent/Makefile (routines): Add getdents64.
* sysdeps/unix/sysv/linux/Makefile [dirent] (sysdep_routines):
Remove getdents64.
* dirent/dirent.h: Redirect getdirentries to getdirentries64 if
compiled with _FILE_OFFSET_BITS=64.
* sysdeps/generic/getdents64.c: New file.
* sysdeps/unix/sysv/linux/getdirentries.c: Also redefine off_t and
__lseek for getdirentries64 definition.
* sysdeps/unix/sysv/linux/llseek.c: Make __lseek64 a strong alias.
* sysdeps/unix/sysv/linux/sys/sendfile.h: Don't allow use with
_FILE_OFFSET_BITS=64.
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getdirentries.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/llseek.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sendfile.h | 6 |
4 files changed, 10 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 04ddf916be..b4ad1a57e6 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -96,7 +96,7 @@ endif inhibit-glue = yes ifeq ($(subdir),dirent) -sysdep_routines += getdents64 getdirentries getdirentries64 +sysdep_routines += getdirentries getdirentries64 endif ifeq ($(subdir),nis) diff --git a/sysdeps/unix/sysv/linux/getdirentries.c b/sysdeps/unix/sysv/linux/getdirentries.c index 1f7ba85c55..cb81ad763b 100644 --- a/sysdeps/unix/sysv/linux/getdirentries.c +++ b/sysdeps/unix/sysv/linux/getdirentries.c @@ -22,6 +22,8 @@ #ifdef GETDENTS64 # define getdirentries getdirentries64 # define __getdents __getdents64 +# define off_t off64_t +# define __lseek __lseek64 #endif ssize_t diff --git a/sysdeps/unix/sysv/linux/llseek.c b/sysdeps/unix/sysv/linux/llseek.c index 466df377c8..a266a79b2a 100644 --- a/sysdeps/unix/sysv/linux/llseek.c +++ b/sysdeps/unix/sysv/linux/llseek.c @@ -1,5 +1,5 @@ /* Long-long seek operation. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 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 @@ -37,5 +37,5 @@ __llseek (int fd, loff_t offset, int whence) &result, whence) ?: result); } weak_alias (__llseek, llseek) -weak_alias (__llseek, __lseek64) +strong_alias (__llseek, __lseek64) weak_alias (__llseek, lseek64) diff --git a/sysdeps/unix/sysv/linux/sys/sendfile.h b/sysdeps/unix/sysv/linux/sys/sendfile.h index 8008101b74..63a9c41493 100644 --- a/sysdeps/unix/sysv/linux/sys/sendfile.h +++ b/sysdeps/unix/sysv/linux/sys/sendfile.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 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 @@ -22,6 +22,10 @@ #include <features.h> #include <sys/types.h> +#ifdef __USE_FILE_OFFSET64 +# error "<sendfile.h> cannot be used with _FILE_OFFSET=64" +#endif + __BEGIN_DECLS /* Send COUNT bytes from file associated with IN_FD starting at OFFSET to |