- 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@

diff --git a/ChangeLog b/ChangeLog
index bcbdbdddc2b96bd5b3e372aa28850287d2a1e450..3be6700583ed50145c64ee8443881994e17236f7 100644 (file)
--- 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.
 

diff --git a/atomicio.c b/atomicio.c
index 79dba9f29bd6ec8418b1f3cc508d14b783c03fa9..afe3444c945c9a85b264ba602cdaaf2f24219ec9 100644 (file)
--- 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>