- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test

[openssh.git] / atomicio.h

diff --git a/atomicio.h b/atomicio.h
index d0252491727e31f5913acc46e7f611248e1a0847..7eccf206b3b884ee3bb39e7a1cb72b9445a310d6 100644 (file)
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,7 +1,7 @@
-/*     $OpenBSD: atomicio.h,v 1.2 2001/01/29 01:58:14 niklas Exp $     */
+/*     $OpenBSD: atomicio.h,v 1.6 2005/05/24 17:32:43 avsm Exp $       */
 
 /*
- * Copyright (c) 1995,1999 Theo de Raadt
+ * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
  */
 
 /*
- * Ensure all of data on socket comes through. f==read || f==write
+ * Ensure all of data on socket comes through. f==read || f==vwrite
  */
-ssize_t        atomicio(ssize_t (*f)(), int fd, void *s, size_t n);
+size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
+
+#define vwrite (ssize_t (*)(int, void *, size_t))write