* 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.

diff --git a/ChangeLog b/ChangeLog
index 9eae02d..4e9b7ff 100644 (file)
--- 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 68f611a..6aaf585 100644 (file)
--- 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 18eafb4..1a674b1 100644 (file)
--- 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 68f611a..6aaf585 100644 (file)
--- 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