diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/Versions | 6 | ||||
| -rw-r--r-- | io/sys/stat.h | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/io/Versions b/io/Versions index 9e650d482a..5b311ee03b 100644 --- a/io/Versions +++ b/io/Versions @@ -97,10 +97,4 @@ libc { # n* nftw; nftw64; } - GLIBC_PRIVATE { - # functions which have an additional interface since they are - # cancelable. - __libc_open; __libc_close; __libc_read; __libc_write; - __libc_lseek; __libc_fcntl; __libc_open64; __libc_lseek64; - } } diff --git a/io/sys/stat.h b/io/sys/stat.h index 24e7fe309f..29e9e625ff 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1995-2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1995-2002,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 @@ -116,7 +116,7 @@ __BEGIN_DECLS # ifdef __S_IFLNK # define S_IFLNK __S_IFLNK # endif -# if (defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN2K) \ +# if (defined __USE_BSD || defined __USE_MISC || defined __USE_UNIX98) \ && defined __S_IFSOCK # define S_IFSOCK __S_IFSOCK # endif @@ -137,13 +137,13 @@ __BEGIN_DECLS # define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK) #endif -#ifdef __USE_BSD -# ifndef __S_IFLNK -# define S_ISLNK(mode) 0 -# endif -# ifdef __S_IFSOCK -# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) -# endif +#if defined __USE_BSD && !defined __S_IFLNK +# define S_ISLNK(mode) 0 +#endif + +#if (defined __USE_BSD || defined __USE_UNIX98) \ + && defined __S_IFSOCK +# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) #endif /* These are from POSIX.1b. If the objects are not implemented using separate |