- dtucker@cvs.openbsd.org 2007/06/25 12:02:27

     [atomicio.c]
     Include <poll.h> like the man page says rather than <sys/poll.h>.  ok djm@

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9deb7bde2..1552f8ce0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
      [channels.c]
      Correct test for window updates every three packets; prevents sending
      window updates for every single packet.  ok markus@
+   - dtucker@cvs.openbsd.org 2007/06/25 12:02:27
+     [atomicio.c]
+     Include <poll.h> like the man page says rather than <sys/poll.h>.  ok djm@
  - (dtucker) [atomicio.c] Test for EWOULDBLOCK in atomiciov to match
    atomicio.
 
@@ -3097,4 +3100,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4708 2007/06/25 09:06:53 dtucker Exp $
+$Id: ChangeLog,v 1.4709 2007/06/25 12:08:10 dtucker Exp $
diff --git a/atomicio.c b/atomicio.c
index 79dba9f29..afe3444c9 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.24 2007/06/19 02:04:43 djm Exp $ */
+/* $OpenBSD: atomicio.c,v 1.25 2007/06/25 12:02:27 dtucker Exp $ */
 /*
  * Copyright (c) 2006 Damien Miller. All rights reserved.
  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -30,9 +30,9 @@
 
 #include <sys/param.h>
 #include <sys/uio.h>
-#include <sys/poll.h>
 
 #include <errno.h>
+#include <poll.h>
 #include <string.h>
 #include <unistd.h>