diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | atomicio.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -20,6 +20,9 @@ | |||
20 | [channels.c] | 20 | [channels.c] |
21 | Correct test for window updates every three packets; prevents sending | 21 | Correct test for window updates every three packets; prevents sending |
22 | window updates for every single packet. ok markus@ | 22 | window updates for every single packet. ok markus@ |
23 | - dtucker@cvs.openbsd.org 2007/06/25 12:02:27 | ||
24 | [atomicio.c] | ||
25 | Include <poll.h> like the man page says rather than <sys/poll.h>. ok djm@ | ||
23 | - (dtucker) [atomicio.c] Test for EWOULDBLOCK in atomiciov to match | 26 | - (dtucker) [atomicio.c] Test for EWOULDBLOCK in atomiciov to match |
24 | atomicio. | 27 | atomicio. |
25 | 28 | ||
@@ -3097,4 +3100,4 @@ | |||
3097 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3100 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3098 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3101 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3099 | 3102 | ||
3100 | $Id: ChangeLog,v 1.4708 2007/06/25 09:06:53 dtucker Exp $ | 3103 | $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 @@ | |||
1 | /* $OpenBSD: atomicio.c,v 1.24 2007/06/19 02:04:43 djm Exp $ */ | 1 | /* $OpenBSD: atomicio.c,v 1.25 2007/06/25 12:02:27 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2006 Damien Miller. All rights reserved. | 3 | * Copyright (c) 2006 Damien Miller. All rights reserved. |
4 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. | 4 | * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. |
@@ -30,9 +30,9 @@ | |||
30 | 30 | ||
31 | #include <sys/param.h> | 31 | #include <sys/param.h> |
32 | #include <sys/uio.h> | 32 | #include <sys/uio.h> |
33 | #include <sys/poll.h> | ||
34 | 33 | ||
35 | #include <errno.h> | 34 | #include <errno.h> |
35 | #include <poll.h> | ||
36 | #include <string.h> | 36 | #include <string.h> |
37 | #include <unistd.h> | 37 | #include <unistd.h> |
38 | 38 | ||