=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/atomicio.h,v retrieving revision 1.6.2.1 retrieving revision 1.7 diff -u -r1.6.2.1 -r1.7 --- src/usr.bin/ssh/atomicio.h 2006/10/06 03:19:32 1.6.2.1 +++ src/usr.bin/ssh/atomicio.h 2006/03/25 22:22:42 1.7 @@ -1,7 +1,6 @@ -/* $OpenBSD: atomicio.h,v 1.6.2.1 2006/10/06 03:19:32 brad Exp $ */ +/* $OpenBSD: atomicio.h,v 1.7 2006/03/25 22:22:42 djm Exp $ */ /* - * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * All rights reserved. * @@ -26,20 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _ATOMICIO_H -#define _ATOMICIO_H - /* * Ensure all of data on socket comes through. f==read || f==vwrite */ size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); #define vwrite (ssize_t (*)(int, void *, size_t))write - -/* - * ensure all of data on socket comes through. f==readv || f==writev - */ -size_t atomiciov(ssize_t (*)(int, const struct iovec *, int), - int, const struct iovec *, int); - -#endif /* _ATOMICIO_H */