diff options
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/stat.h | 46 | ||||
| -rw-r--r-- | include/sys/uio.h | 61 |
2 files changed, 46 insertions, 61 deletions
diff --git a/include/sys/stat.h b/include/sys/stat.h index 13c50411d..b4e1620df 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -276,37 +276,37 @@ extern int mkfifo __P ((__const char *__path, __mode_t __mode)); /* Wrappers for stat and mknod system calls. */ #ifndef __USE_FILE_OFFSET64 -extern int __fxstat __P ((int __ver, int __fildes, +extern int _fxstat __P ((int __ver, int __fildes, struct stat *__stat_buf)); -extern int __xstat __P ((int __ver, __const char *__filename, +extern int _xstat __P ((int __ver, __const char *__filename, struct stat *__stat_buf)); -extern int __lxstat __P ((int __ver, __const char *__filename, +extern int _lxstat __P ((int __ver, __const char *__filename, struct stat *__stat_buf)); #else # ifdef __REDIRECT -extern int __REDIRECT (__fxstat, __P ((int __ver, int __fildes, - struct stat *__stat_buf)), __fxstat64); -extern int __REDIRECT (__xstat, __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)), __xstat64); -extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)), __lxstat64); +extern int __REDIRECT (_fxstat, __P ((int __ver, int __fildes, + struct stat *__stat_buf)), _fxstat64); +extern int __REDIRECT (_xstat, __P ((int __ver, __const char *__filename, + struct stat *__stat_buf)), _xstat64); +extern int __REDIRECT (_lxstat, __P ((int __ver, __const char *__filename, + struct stat *__stat_buf)), _lxstat64); # else -# define __fxstat __fxstat64 -# define __xstat __xstat64 -# define __lxstat __lxstat64 +# define _fxstat _fxstat64 +# define _xstat _xstat64 +# define _lxstat _lxstat64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int __fxstat64 __P ((int __ver, int __fildes, +extern int _fxstat64 __P ((int __ver, int __fildes, struct stat64 *__stat_buf)); -extern int __xstat64 __P ((int __ver, __const char *__filename, +extern int _xstat64 __P ((int __ver, __const char *__filename, struct stat64 *__stat_buf)); -extern int __lxstat64 __P ((int __ver, __const char *__filename, +extern int _lxstat64 __P ((int __ver, __const char *__filename, struct stat64 *__stat_buf)); #endif -extern int __xmknod __P ((int __ver, __const char *__path, +extern int _xmknod __P ((int __ver, __const char *__path, __mode_t __mode, __dev_t *__dev)); #if defined __GNUC__ && __GNUC__ >= 2 @@ -315,27 +315,27 @@ extern int __xmknod __P ((int __ver, __const char *__path, extern __inline__ int stat (__const char *__path, struct stat *__statbuf) { - return __xstat (_STAT_VER, __path, __statbuf); + return _xstat (_STAT_VER, __path, __statbuf); } # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED extern __inline__ int lstat (__const char *__path, struct stat *__statbuf) { - return __lxstat (_STAT_VER, __path, __statbuf); + return _lxstat (_STAT_VER, __path, __statbuf); } # endif extern __inline__ int fstat (int __fd, struct stat *__statbuf) { - return __fxstat (_STAT_VER, __fd, __statbuf); + return _fxstat (_STAT_VER, __fd, __statbuf); } # if defined __USE_MISC || defined __USE_BSD extern __inline__ int mknod (__const char *__path, __mode_t __mode, __dev_t __dev) { - return __xmknod (_MKNOD_VER, __path, __mode, &__dev); + return _xmknod (_MKNOD_VER, __path, __mode, &__dev); } # endif @@ -343,20 +343,20 @@ extern __inline__ int mknod (__const char *__path, __mode_t __mode, extern __inline__ int stat64 (__const char *__path, struct stat64 *__statbuf) { - return __xstat64 (_STAT_VER, __path, __statbuf); + return _xstat64 (_STAT_VER, __path, __statbuf); } # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED extern __inline__ int lstat64 (__const char *__path, struct stat64 *__statbuf) { - return __lxstat64 (_STAT_VER, __path, __statbuf); + return _lxstat64 (_STAT_VER, __path, __statbuf); } # endif extern __inline__ int fstat64 (int __fd, struct stat64 *__statbuf) { - return __fxstat64 (_STAT_VER, __fd, __statbuf); + return _fxstat64 (_STAT_VER, __fd, __statbuf); } # endif diff --git a/include/sys/uio.h b/include/sys/uio.h index 87120e6ff..0be33e9b4 100644 --- a/include/sys/uio.h +++ b/include/sys/uio.h @@ -1,64 +1,49 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1992, 1996, 1997, 1998 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifndef _SYS_UIO_H - #define _SYS_UIO_H 1 -#include <features.h> - -__BEGIN_DECLS -#define __need_size_t -#include <stddef.h> - -/* That is a klude for Linux. */ -#ifdef __linux__ -#include <linux/socket.h> -#endif +#include <features.h> -#ifndef __LINUX_UIO_H +#include <sys/types.h> -/* Structure describing a section of memory. */ +__BEGIN_DECLS -struct iovec -{ - /* Starting address. */ - __ptr_t iov_base; - /* Length in bytes. */ - size_t iov_len; -}; +/* This file defines `struct iovec'. */ +#include <bits/uio.h> -#endif /* Read data from file descriptor FD, and put the result in the buffers described by VECTOR, which is a vector of COUNT `struct iovec's. The buffers are filled in the order specified. Operates just like `read' (see <unistd.h>) except that data are put in VECTOR instead of a contiguous buffer. */ -int readv __P ((int __fd, __const struct iovec * __vector, size_t __count)); +extern ssize_t readv __P ((int __fd, __const struct iovec *__vector, + int __count)); /* Write data pointed by the buffers described by VECTOR, which is a vector of COUNT `struct iovec's, to file descriptor FD. The data is written in the order specified. Operates just like `write' (see <unistd.h>) except that the data are taken from VECTOR instead of a contiguous buffer. */ -int writev __P ((int __fd, __const struct iovec * __vector, size_t __count)); - +extern ssize_t writev __P ((int __fd, __const struct iovec *__vector, + int __count)); __END_DECLS |