diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /atomicio.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'atomicio.c')
-rw-r--r-- | atomicio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/atomicio.c b/atomicio.c index 47161eb3a..7637e1671 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -24,16 +24,16 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: atomicio.c,v 1.10 2001/05/08 22:48:07 markus Exp $"); | 27 | RCSID("$OpenBSD: atomicio.c,v 1.12 2003/07/31 15:50:16 avsm Exp $"); |
28 | 28 | ||
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * ensure all of data on socket comes through. f==read || f==write | 32 | * ensure all of data on socket comes through. f==read || f==vwrite |
33 | */ | 33 | */ |
34 | ssize_t | 34 | ssize_t |
35 | atomicio(f, fd, _s, n) | 35 | atomicio(f, fd, _s, n) |
36 | ssize_t (*f) (); | 36 | ssize_t (*f) (int, void *, size_t); |
37 | int fd; | 37 | int fd; |
38 | void *_s; | 38 | void *_s; |
39 | size_t n; | 39 | size_t n; |