diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-04-07 10:58:21 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-04-07 10:58:21 +0000 |
| commit | 4b25e22b0625884774fd5d09654f526c265baa2d (patch) | |
| tree | e81a45708468431a673dc19ee5126462c9c5ee50 /libc/io | |
| parent | 774f6474a25106e72432db818dde72aa1b97f6eb (diff) | |
Merge changes between r10115 and r10195 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10196 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/io')
| -rw-r--r-- | libc/io/sys/stat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libc/io/sys/stat.h b/libc/io/sys/stat.h index 7afee9c67..5c389ee9b 100644 --- a/libc/io/sys/stat.h +++ b/libc/io/sys/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009 +/* Copyright (C) 1991, 1992, 1995-2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -143,9 +143,11 @@ __BEGIN_DECLS # define S_ISLNK(mode) 0 #endif -#if (defined __USE_BSD || defined __USE_UNIX98) \ +#if (defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K) \ && defined __S_IFSOCK # define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) +#elif defined __USE_XOPEN2K +# define S_ISSOCK(mode) 0 #endif /* These are from POSIX.1b. If the objects are not implemented using separate |