aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--bits/poll.h11
-rw-r--r--sysdeps/generic/bits/poll.h11
-rw-r--r--sysdeps/mach/hurd/bits/fcntl.h8
4 files changed, 29 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 2daef263e9..67711d3062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-22 Roland McGrath <roland@frob.com>
+
+ * conform/conformtest.pl (checknamespace): Sort the output list.
+
+ * sysdeps/generic/bits/poll.h (POLLWRBAND): New alias for POLLOUT.
+ (POLLRDNORM, POLLRDBAND, POLLWRNORM, POLLWRBAND): Make these
+ definitions conditional on [__USE_XOPEN].
+
+ * sysdeps/mach/hurd/bits/fcntl.h (O_ASYNC, O_FSYNC, O_SYNC): Define
+ these unconditionally, not only use [__USE_BSD], so as to match
+ the sysdeps/unix/sysv/linux files.
+
2001-08-22 Ulrich Drepper <drepper@redhat.com>
* test-skeleton.c (add_temp_file): Add __attribute__ ((unused)) to
diff --git a/bits/poll.h b/bits/poll.h
index a3da4306ad..022a06cc1b 100644
--- a/bits/poll.h
+++ b/bits/poll.h
@@ -27,10 +27,13 @@
#define POLLPRI 02 /* There is urgent data to read. */
#define POLLOUT 04 /* Writing now will not block. */
-/* Some aliases. */
-#define POLLWRNORM POLLOUT
-#define POLLRDNORM POLLIN
-#define POLLRDBAND POLLPRI
+#ifdef __USE_XOPEN
+/* These values are defined in XPG4.2. */
+# define POLLRDNORM POLLIN /* Normal data may be read. */
+# define POLLRDBAND POLLPRI /* Priority data may be read. */
+# define POLLWRNORM POLLOUT /* Writing now will not block. */
+# define POLLWRBAND POLLOUT /* Priority data may be written. */
+#endif
/* 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/sysdeps/generic/bits/poll.h b/sysdeps/generic/bits/poll.h
index a3da4306ad..022a06cc1b 100644
--- a/sysdeps/generic/bits/poll.h
+++ b/sysdeps/generic/bits/poll.h
@@ -27,10 +27,13 @@
#define POLLPRI 02 /* There is urgent data to read. */
#define POLLOUT 04 /* Writing now will not block. */
-/* Some aliases. */
-#define POLLWRNORM POLLOUT
-#define POLLRDNORM POLLIN
-#define POLLRDBAND POLLPRI
+#ifdef __USE_XOPEN
+/* These values are defined in XPG4.2. */
+# define POLLRDNORM POLLIN /* Normal data may be read. */
+# define POLLRDBAND POLLPRI /* Priority data may be read. */
+# define POLLWRNORM POLLOUT /* Writing now will not block. */
+# define POLLWRBAND POLLOUT /* Priority data may be written. */
+#endif
/* 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/sysdeps/mach/hurd/bits/fcntl.h b/sysdeps/mach/hurd/bits/fcntl.h
index 8e39f636c2..09da177e69 100644
--- a/sysdeps/mach/hurd/bits/fcntl.h
+++ b/sysdeps/mach/hurd/bits/fcntl.h
@@ -65,11 +65,9 @@
returned by `fcntl' with the F_GETFL command. */
#define O_APPEND 0x0100 /* Writes always append to the file. */
-#ifdef __USE_BSD
-# define O_ASYNC 0x0200 /* Send SIGIO to owner when data is ready. */
-# define O_FSYNC 0x0400 /* Synchronous writes. */
-# define O_SYNC O_FSYNC
-#endif
+#define O_ASYNC 0x0200 /* Send SIGIO to owner when data is ready. */
+#define O_FSYNC 0x0400 /* Synchronous writes. */
+#define O_SYNC O_FSYNC
#ifdef __USE_GNU
# define O_NOATIME 0x0800 /* Don't set access time on read (owner). */
#endif