Merge 4.0p1 to the trunk.

1 files changed, 5 insertions, 1 deletions

diff --git a/buffer.h b/buffer.h
index 5e4c41244..9c09d4f43 100644
--- a/buffer.h
+++ b/buffer.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: buffer.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $     */
+/*      $OpenBSD: buffer.h,v 1.12 2004/10/29 23:56:17 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -40,4 +40,8 @@ void	 buffer_consume_end(Buffer *, u_int);
 
 void     buffer_dump(Buffer *);
 
+int      buffer_get_ret(Buffer *, void *, u_int);
+int      buffer_consume_ret(Buffer *, u_int);
+int      buffer_consume_end_ret(Buffer *, u_int);
+
 #endif                          /* BUFFER_H */