diff options
| author | Roland McGrath <roland@gnu.org> | 2000-03-10 04:30:29 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-03-10 04:30:29 +0000 |
| commit | 07760b357c8100172b81e7169d345834cb381ac8 (patch) | |
| tree | 59b0cdaf234549d41a2bef4670c06bc1cd2ab581 | |
| parent | 224a12bcb24482855424c7a9478c00a445f1b86a (diff) | |
| download | glibc-07760b357c8100172b81e7169d345834cb381ac8.tar.gz glibc-07760b357c8100172b81e7169d345834cb381ac8.tar.xz glibc-07760b357c8100172b81e7169d345834cb381ac8.zip | |
* io/sys/stat.h: Fix inverted sense of `defined __S_IFSOCK' test,
broken by 2000-02-27 change. * sysdeps/generic/bits/poll.h (POLLRDNORM, POLLRDBAND): New macros.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bits/poll.h | 4 | ||||
| -rw-r--r-- | io/sys/stat.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/bits/poll.h | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 9eae02de90..4e9b7ffa2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-03-09 Roland McGrath <roland@baalperazim.frob.com> + + * io/sys/stat.h: Fix inverted sense of `defined __S_IFSOCK' test, + broken by 2000-02-27 change. + + * sysdeps/generic/bits/poll.h (POLLRDNORM, POLLRDBAND): New macros. + 2000-02-23 Roland McGrath <roland@baalperazim.frob.com> * sysdeps/mach/hurd/sigstack.c (sigstack): Remove `const' from diff --git a/bits/poll.h b/bits/poll.h index 68f611a428..6aaf5859aa 100644 --- a/bits/poll.h +++ b/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997,2000 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 @@ -29,6 +29,8 @@ /* Some aliases. */ #define POLLWRNORM POLLOUT +#define POLLRDNORM POLLIN +#define POLLRDBAND POLLPRI /* Event types always implicitly polled for. These bits need not be set in `events', but they will appear in `revents' to indicate the status of diff --git a/io/sys/stat.h b/io/sys/stat.h index 18eafb4bca..1a674b1df2 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -109,7 +109,7 @@ __BEGIN_DECLS # ifdef __S_IFLNK # define S_IFLNK __S_IFLNK # endif -# if (defined __USE_BSD || defined __USE_MISC) && !defined __S_IFSOCK +# if (defined __USE_BSD || defined __USE_MISC) && defined __S_IFSOCK # define S_IFSOCK __S_IFSOCK # endif #endif diff --git a/sysdeps/generic/bits/poll.h b/sysdeps/generic/bits/poll.h index 68f611a428..6aaf5859aa 100644 --- a/sysdeps/generic/bits/poll.h +++ b/sysdeps/generic/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997,2000 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 @@ -29,6 +29,8 @@ /* Some aliases. */ #define POLLWRNORM POLLOUT +#define POLLRDNORM POLLIN +#define POLLRDBAND POLLPRI /* Event types always implicitly polled for. These bits need not be set in `events', but they will appear in `revents' to indicate the status of |