From 958f238f3619373d3dbc106d3cda3c467b3419b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 26 May 1999 23:37:38 +0000 Subject: Update. 1999-05-26 Ulrich Drepper * config.h.in: Add __LINUX_KERNEL_VERSION. * configure.in: Recognize --enable-kernel. * sysdeps/unix/sysv/linux/configure.in: Check for correct kernel headers if --enable-kernel is given and set __LINUX_KERNEL_VERSION appropriately. * sysdeps/unix/sysv/linux/init-first.c: If minimal kernel version is given perform runtime test. * sysdeps/unix/sysv/linux/kernel-features.h: New file. * sysdeps/unix/sysv/linux/getcwd.c: Elide compatibility code if minimal supported kernel is known to have the feature. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/seteuid.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/testrtsig.h: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread64.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/sysctl.c: Add __sysctl alias. --- sysdeps/unix/sysv/linux/pread.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/pread.c') diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c index a9461cab2e..cae3d62a5d 100644 --- a/sysdeps/unix/sysv/linux/pread.c +++ b/sysdeps/unix/sysv/linux/pread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,13 +23,17 @@ #include #include -#ifdef __NR_pread +#include "kernel-features.h" + +#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0 extern ssize_t __syscall_pread (int fd, void *buf, size_t count, off_t offset_hi, off_t offset_lo); +# if __ASSUME_PREAD_SYSCALL == 0 static ssize_t __emulate_pread (int fd, void *buf, size_t count, off_t offset) internal_function; +# endif ssize_t @@ -43,16 +47,21 @@ __pread (fd, buf, count, offset) /* First try the syscall. */ result = INLINE_SYSCALL (pread, 5, fd, buf, count, 0, offset); +# if __ASSUME_PREAD_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ result = __emulate_pread (fd, buf, count, offset); +# endif return result; } weak_alias (__pread, pread) -#define __pread(fd, buf, count, offset) \ +# define __pread(fd, buf, count, offset) \ static internal_function __emulate_pread (fd, buf, count, offset) #endif -#include + +#if __ASSUME_PREAD_SYSCALL == 0 +# include +#endif -- cgit v1.2.1