From f377d02227448a6f0d97eaf48ba60483c2f27e98 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Sep 2004 22:33:37 +0000 Subject: Update. * include/atomic.h: Define atomic_increment_val, atomic_decrement_val, and atomic_dealy is not already defined. * sysdeps/i386/i486/bits/atomic.h: Define atomic_delay. * sysdeps/x86_64/bits/atomic.h: Likewise. * miscd/sys/cdefs.h (__NTH): New macro. (__THROW): Define using nothrow attribute for C code and gcc >= 3.2. (__REDIRECT_NTH): New macro. * argp/argp.h: Use __NTH and __REDIRECT_NTH where necessary. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. * io/fcntl.h: Likewise. * io/sys/sendfile.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/sys/statvfs.h: Likewise. * libio/bits/stdio.h: Likewise. * misc/sys/mman.h: Likewise. * posix/unistd.h: Likewise. * resource/sys/resource.h: Likewise. * rt/aio.h: Likewise. * signal/signal.h: Likewise. * stdlib/stdlib.h: Likewise. * string/argz.h: Likewise. * string/string.h: Likewise. * sysdeps/generic/inttypes.h: Likewise. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/powerpc/fpu/bits/mathinline.h: Likewise. * sysdeps/s390/fpu/bits/mathinline.h: Likewise. * sysdeps/x86_64/fpu/bits/mathinline.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/bits/sys/sysmacros.h: Likewise. * wcsmbs/wchar.h: Likewise. * sysdeps/generic/glob.c: Use __PMT isntead of __P where appropriate. * resolv/gethnamaddr.c (getanswer): Remove __P use in variable definition. * io/sys/poll.h: Remove __THROW from poll prototype, it's a cancellation point. --- io/fcntl.h | 10 ++++----- io/sys/sendfile.h | 11 +++++----- io/sys/stat.h | 63 ++++++++++++++++++++++++++----------------------------- io/sys/statfs.h | 16 +++++++------- io/sys/statvfs.h | 17 +++++++-------- 5 files changed, 56 insertions(+), 61 deletions(-) (limited to 'io') diff --git a/io/fcntl.h b/io/fcntl.h index b81a5b7230..b1a9f65387 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1994-2001,2003,2004 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 @@ -136,10 +136,10 @@ extern int lockf64 (int __fd, int __cmd, __off64_t __len); extern int posix_fadvise (int __fd, __off_t __offset, __off_t __len, int __advise) __THROW; # else -# ifdef __REDIRECT -extern int __REDIRECT (posix_fadvise, (int __fd, __off64_t __offset, - __off64_t __len, int __advise) __THROW, - posix_fadvise64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (posix_fadvise, (int __fd, __off64_t __offset, + __off64_t __len, int __advise), + posix_fadvise64); # else # define posix_fadvise posix_fadvise64 # endif diff --git a/io/sys/sendfile.h b/io/sys/sendfile.h index 797822b9fe..4c1367b6be 100644 --- a/io/sys/sendfile.h +++ b/io/sys/sendfile.h @@ -1,5 +1,5 @@ /* sendfile -- copy data directly from one file descriptor to another - Copyright (C) 1998,99,01,2002 Free Software Foundation, Inc. + Copyright (C) 1998,99,01,2002,2004 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 @@ -34,11 +34,10 @@ __BEGIN_DECLS 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); +# ifdef __REDIRECT_NTH +extern ssize_t __REDIRECT_NTH (sendfile, + (int __out_fd, int __in_fd, __off64_t *__offset, + size_t __count), sendfile64); # else # define sendfile sendfile64 # endif diff --git a/io/sys/stat.h b/io/sys/stat.h index e71006a43d..abe68860cb 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -211,12 +211,10 @@ extern int stat (__const char *__restrict __file, that file descriptor FD is open on and put them in BUF. */ extern int fstat (int __fd, struct stat *__buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (stat, - (__const char *__restrict __file, - struct stat *__restrict __buf) __THROW, - stat64); -extern int __REDIRECT (fstat, (int __fd, struct stat *__buf) __THROW, fstat64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (stat, (__const char *__restrict __file, + struct stat *__restrict __buf), stat64); +extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64); # else # define stat stat64 # define fstat fstat64 @@ -235,11 +233,10 @@ extern int fstat64 (int __fd, struct stat64 *__buf) __THROW; extern int lstat (__const char *__restrict __file, struct stat *__restrict __buf) __THROW; # else -# ifdef __REDIRECT -extern int __REDIRECT (lstat, - (__const char *__restrict __file, - struct stat *__restrict __buf) __THROW, - lstat64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (lstat, + (__const char *__restrict __file, + struct stat *__restrict __buf), lstat64); # else # define lstat lstat64 # endif @@ -322,15 +319,13 @@ extern int __xstat (int __ver, __const char *__filename, extern int __lxstat (int __ver, __const char *__filename, struct stat *__stat_buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (__fxstat, (int __ver, int __fildes, - struct stat *__stat_buf) __THROW, - __fxstat64); -extern int __REDIRECT (__xstat, (int __ver, __const char *__filename, - struct stat *__stat_buf) __THROW, __xstat64); -extern int __REDIRECT (__lxstat, (int __ver, __const char *__filename, - struct stat *__stat_buf) __THROW, - __lxstat64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (__fxstat, (int __ver, int __fildes, + struct stat *__stat_buf), __fxstat64); +extern int __REDIRECT_NTH (__xstat, (int __ver, __const char *__filename, + struct stat *__stat_buf), __xstat64); +extern int __REDIRECT_NTH (__lxstat, (int __ver, __const char *__filename, + struct stat *__stat_buf), __lxstat64); # else # define __fxstat __fxstat64 @@ -353,28 +348,29 @@ extern int __xmknod (int __ver, __const char *__path, __mode_t __mode, #if defined __GNUC__ && __GNUC__ >= 2 /* Inlined versions of the real stat and mknod functions. */ -extern __inline__ int stat (__const char *__path, - struct stat *__statbuf) __THROW +extern __inline__ int +__NTH (stat (__const char *__path, struct stat *__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) __THROW +extern __inline__ int +__NTH (lstat (__const char *__path, struct stat *__statbuf)) { return __lxstat (_STAT_VER, __path, __statbuf); } # endif -extern __inline__ int fstat (int __fd, struct stat *__statbuf) __THROW +extern __inline__ int +__NTH (fstat (int __fd, struct stat *__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) __THROW +extern __inline__ int +__NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev)) { return __xmknod (_MKNOD_VER, __path, __mode, &__dev); } @@ -382,22 +378,23 @@ extern __inline__ int mknod (__const char *__path, __mode_t __mode, # if defined __USE_LARGEFILE64 \ && (! defined __USE_FILE_OFFSET64 \ - || (defined __REDIRECT && defined __OPTIMIZE__)) -extern __inline__ int stat64 (__const char *__path, - struct stat64 *__statbuf) __THROW + || (defined __REDIRECT_NTH && defined __OPTIMIZE__)) +extern __inline__ int +__NTH (stat64 (__const char *__path, struct stat64 *__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) __THROW +extern __inline__ int +__NTH (lstat64 (__const char *__path, struct stat64 *__statbuf)) { return __lxstat64 (_STAT_VER, __path, __statbuf); } # endif -extern __inline__ int fstat64 (int __fd, struct stat64 *__statbuf) __THROW +extern __inline__ int +__NTH (fstat64 (int __fd, struct stat64 *__statbuf)) { return __fxstat64 (_STAT_VER, __fd, __statbuf); } diff --git a/io/sys/statfs.h b/io/sys/statfs.h index 969d9d0e58..c93d8f1d44 100644 --- a/io/sys/statfs.h +++ b/io/sys/statfs.h @@ -1,5 +1,5 @@ /* Definitions for getting information about a filesystem. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2004 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 @@ -31,10 +31,10 @@ __BEGIN_DECLS #ifndef __USE_FILE_OFFSET64 extern int statfs (__const char *__file, struct statfs *__buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (statfs, - (__const char *__file, struct statfs *__buf) __THROW, - statfs64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (statfs, + (__const char *__file, struct statfs *__buf), + statfs64); # else # define statfs statfs64 # endif @@ -48,9 +48,9 @@ extern int statfs64 (__const char *__file, struct statfs64 *__buf) __THROW; #ifndef __USE_FILE_OFFSET64 extern int fstatfs (int __fildes, struct statfs *__buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (fstatfs, (int __fildes, struct statfs *__buf) __THROW, - fstatfs64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf), + fstatfs64); # else # define fstatfs fstatfs64 # endif diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h index f34f8d318e..7c6c90fae0 100644 --- a/io/sys/statvfs.h +++ b/io/sys/statvfs.h @@ -1,5 +1,5 @@ /* Definitions for getting information about a filesystem. - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2004 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 @@ -52,11 +52,10 @@ __BEGIN_DECLS extern int statvfs (__const char *__restrict __file, struct statvfs *__restrict __buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (statvfs, - (__const char *__restrict __file, - struct statvfs *__restrict __buf) __THROW, - statvfs64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (statvfs, + (__const char *__restrict __file, + struct statvfs *__restrict __buf), statvfs64); # else # define statvfs statvfs64 # endif @@ -71,9 +70,9 @@ extern int statvfs64 (__const char *__restrict __file, #ifndef __USE_FILE_OFFSET64 extern int fstatvfs (int __fildes, struct statvfs *__buf) __THROW; #else -# ifdef __REDIRECT -extern int __REDIRECT (fstatvfs, (int __fildes, struct statvfs *__buf) __THROW, - fstatvfs64); +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (fstatvfs, (int __fildes, struct statvfs *__buf), + fstatvfs64); # else # define fstatvfs fstatvfs64 # endif -- cgit 1.4.1